diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java index 9eb1db01..b2bce012 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java @@ -22,4 +22,6 @@ public interface MaterialExtendMapperEx { List getListByMId(@Param("ids") Long ids[]); int batchDeleteMaterialExtendByMIds(@Param("ids") String ids[]); + + int specialUpdatePrice(MaterialExtend record); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java index 2082afd3..a09907f5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java @@ -183,6 +183,8 @@ public class MaterialExtendService { materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("lowDecimal")); } this.updateMaterialExtend(materialExtend); + //如果金额为空,此处单独置空 + materialExtendMapperEx.specialUpdatePrice(materialExtend); } } //处理条码的排序,基本单位排第一个 @@ -238,13 +240,13 @@ public class MaterialExtendService { } @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int updateMaterialExtend(MaterialExtend MaterialExtend) throws Exception{ + public int updateMaterialExtend(MaterialExtend materialExtend) throws Exception{ User user = userService.getCurrentUser(); - MaterialExtend.setUpdateTime(System.currentTimeMillis()); - MaterialExtend.setUpdateSerial(user.getLoginName()); + materialExtend.setUpdateTime(System.currentTimeMillis()); + materialExtend.setUpdateSerial(user.getLoginName()); int res =0; try{ - res= materialExtendMapper.updateByPrimaryKeySelective(MaterialExtend); + res= materialExtendMapper.updateByPrimaryKeySelective(materialExtend); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml index 60d623df..473a23d1 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml @@ -65,4 +65,14 @@ ) + + + update jsh_material_extend + set purchase_decimal = #{purchaseDecimal,jdbcType=DECIMAL}, + commodity_decimal = #{commodityDecimal,jdbcType=DECIMAL}, + wholesale_decimal = #{wholesaleDecimal,jdbcType=DECIMAL}, + low_decimal = #{lowDecimal,jdbcType=DECIMAL} + where id = #{id,jdbcType=BIGINT} + and ifnull(delete_flag,'0') !='1' + \ No newline at end of file