代码备份

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1367,12 +1367,7 @@ public class CtqyyClient extends CommonHttpClient {
         LambdaQueryWrapper<VYpzsPresInfo> wrapper = new LambdaQueryWrapper<>();
         String code = udiwmsBasicSkPrescribeRequest.getCode();
         if (StrUtil.isNotEmpty(code)) {
-            wrapper.or(
+            wrapper.or().eq(VYpzsPresInfo::getSTOOUT_NO, code).or().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code);
-                    innerWrapper -> {
-                        innerWrapper.eq(VYpzsPresInfo::getSTOOUT_NO, code);
-                        innerWrapper.eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code);
-                    }
-            );
         }
         //补充其他查询条件
         IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper
@@ -1515,7 +1510,7 @@ public class CtqyyClient extends CommonHttpClient {
      * @param udiwmsBasicSkPrescribeRequest
      * @return
      */
-    private BaseResponse ioCollectOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest,IPage<VYpzsPresInfo> page){
+    private BaseResponse ioCollectOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VYpzsPresInfo> page) {
         List<VYpzsPresInfo> presInfoEntities = page.getRecords();
         if (CollUtil.isNotEmpty(presInfoEntities)) {
             //数据处理以io_collect_order，io_collect_order_biz 主子返回
@@ -1528,7 +1523,7 @@ public class CtqyyClient extends CommonHttpClient {
                 ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
-                ioCollectOrder.setWorkPlaceCode(Long.valueOf(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()));
+                ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
                 Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME());
                 ioCollectOrder.setBillTime(date);
                 ioCollectOrder.setCreateTime(new Date());
@@ -1549,6 +1544,7 @@ public class CtqyyClient extends CommonHttpClient {
                     collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
                     collectOrderBiz.setGgxh(entity.getPACK_SPEC());
                     collectOrderBiz.setBatchNo("");
+                    collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
                     collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
                     collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
                     collectOrderBiz.setTagStatus(1);

src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java

@@ -55,6 +55,8 @@ public class IoCollectOrder implements Serializable {
     @TableField(value = "fromCorp")
     private String fromCorp;
 
+
+
     /**
      * 单据时间
      */

src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java

@@ -105,7 +105,7 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
     /**
      * 工位
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      *