Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -275,7 +275,7 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer());
             ioOrderDetailResultData.put("measname", ioOrderDetailResultResponse.getMeasname() == null ? ' ' : ioOrderDetailResultResponse.getMeasname());
             ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec());
-            ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice());
+            ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? null : ioOrderDetailResultResponse.getPrice());
             ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount());
             ioOrderDetailResultData.put("reCount", ioOrderDetailResultResponse.getReCount());
             ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount());

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -271,5 +271,8 @@ public class IoOrderEntity {
     @TableField(value = "outSickInfo")
     private String outSickInfo;
 
+    @TableField(value = "fromSpmsOrders")
+    private String fromSpmsOrders;
+
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -326,8 +326,18 @@ public class IoOrderServiceImpl implements IoOrderService {
                 ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount);
                 ioOrderDetailResultService.update(ioOrderDetailResultEntity);
             } else {
+                int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode());
                 //如果数量扣减之后为0，直接删除此条码
                 codeService.deleteById(ioCodeEntity.getId());
+                //更新扫码单据详情
+                IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo());
+                ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount);
+                ioOrderDetailCodeService.update(ioOrderDetailCodeEntity);
+
+                //更新结果详情
+                IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo());
+                ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount);
+                ioOrderDetailResultService.update(ioOrderDetailResultEntity);
             }
             //已审核单据需扣减库存
             if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
@@ -399,6 +409,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                         int count = invProductDetailEntity.getCount() - 1;
                         int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         if (count == 0) {
+
                             invProductDetailService.deleteById(invProductDetailEntity.getId());
                         } else {
                             //更新详情表

src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java

@@ -383,6 +383,12 @@ public class PlatformServiceImpl implements PlatformService {
                 JSON.toJSONString(ioUploadOrderResponse), buildHeader(platformLinkRespons.getAppid(), platformLinkRespons.getSecretKey()));
         //回调结果 返回信息
         if (StrUtil.isNotBlank(resp) && resp.contains("20000")) {
+            BaseResponse baseResponse= JSON.parseObject(resp, BaseResponse.class);
+            String formSpmsOrders= (String) baseResponse.getData();
+            IoOrderEntity ioOrderEntity1=new IoOrderEntity();
+            ioOrderEntity1.setFromSpmsOrders(formSpmsOrders);
+            ioOrderEntity1.setBillNo(orderId);
+            ioOrderService.updateByBillNo(ioOrderEntity1);
             return JSON.parseObject(resp, BaseResponse.class);
         } else {
             log.error("获取自助平台分库失败");

src/main/resources/schemas/schema_v2.1.sql

@@ -602,3 +602,5 @@ CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
                          'varchar(255) ', 1);
 
+CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1);
+