|
|
@ -118,9 +118,11 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
} |
|
|
|
} |
|
|
|
// 记录修改记录
|
|
|
|
// 记录修改记录
|
|
|
|
Long userId = userInfoService.getUser().getUserId(); |
|
|
|
Long userId = userInfoService.getUser().getUserId(); |
|
|
|
commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId); |
|
|
|
int i = commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId); |
|
|
|
|
|
|
|
if(i != -1){ |
|
|
|
|
|
|
|
i = commodityMapper.updateCommodity(codeEntity, shList); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int i = commodityMapper.updateCommodity(codeEntity, shList); |
|
|
|
|
|
|
|
flag = i >= 0; |
|
|
|
flag = i >= 0; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
@ -652,8 +654,8 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
/** |
|
|
|
/** |
|
|
|
* 数据转换 |
|
|
|
* 数据转换 |
|
|
|
* |
|
|
|
* |
|
|
|
* @param orderItemInfo |
|
|
|
* @param |
|
|
|
* @param xhfMc |
|
|
|
* @param |
|
|
|
* @param taxClassCodeEntity |
|
|
|
* @param taxClassCodeEntity |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|