feature：集团物料库变更税编

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -204,13 +204,14 @@ public class CommodityController {
         CommodityCodeEntity commodityCode = new CommodityCodeEntity();
         commodityCode.setSpjc(spjc);
         commodityCode.setSpbm(spbm);
+        commodityCode.setModifyTime(new Date());
+        commodityCode.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ?userInfoService.getUser().getUserId().toString():"");
         try {
-            commodityService.batchUpdateCommodity(commodityCode,ids);
+            return commodityService.batchUpdateCommodity(commodityCode,ids);
         } catch (Exception e) {
             log.error("更新集团物料失败，异常信息{}",e);
             return R.error("系统更新异常，请联系管理员");
         }
-        return R.ok();
     }
     /**
      * 删除

order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml

@@ -465,6 +465,9 @@
             <if test="commodityCode.modifyTime != null and commodityCode.modifyTime != ''">
                 modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="commodityCode.modifyUserId != null and commodityCode.modifyUserId != ''">
+                modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR},
+            </if>
             <if test="commodityCode.bz != null and commodityCode.bz != ''">
                 description = #{commodityCode.bz,jdbcType=VARCHAR},
             </if>

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java

@@ -158,7 +158,8 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }else{
                 newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
                 newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
-                newCommodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_SOURCE_9.getKey());
+                newCommodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_9.getKey());
+                newCommodityCodeEntity.setDataState(ConfigureConstant.STRING_0);
                 newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc());
                 newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1);
                 newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0);