Merge remote-tracking branch 'origin/master'

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -204,4 +204,6 @@ public interface MesReportWorkMapper {
 
     @MapKey("shiftId")
     List<Map<String, String>> getPlanNumber(String shiftId);
+
+    List<String> getUnionRemark(String workorderCode);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -267,7 +267,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateTime(nowTime);
 			mesReportWork.setUpdateBy(updateBy);
 		}
-
+        //统一备注
+        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
+		if(!CollectionUtils.isEmpty(remarks)){
+			for(MesReportWork mesReportWork:mesReportWorks){
+				mesReportWork.setRemark(remarks.get(0));
+			}
+		}
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1083,6 +1083,9 @@ WHERE
 	AND c.shift_id=#{shiftId}
 
 	</select>
+	<select id="getUnionRemark" resultType="java.lang.String">
+		select remark from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and remark is not null
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -729,7 +729,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);
-			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
+			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
 				qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理
@@ -1007,7 +1007,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);
-			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
+			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
 				qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理
@@ -1029,6 +1029,18 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				System.out.println("base_file:"+n);
 			}
 
+//			/**去掉测量值0**/
+//			String actualValueStr = detail.getActualValue();
+//			if(StringUtils.isNotBlank(actualValueStr)){
+//				JSONArray codeArray = JSONArray.parseArray(actualValueStr);
+//				for (int c1 = 0; c1 < codeArray.size(); c1++) {
+//					if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+//						codeArray.remove(codeArray.get(c1));
+//					}
+//				}
+//				detail.setActualValue(codeArray.toJSONString());
+//			}
+
 		}
 		if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){
 			qcCheckTask.setSampleQuality(sampleQuality);
@@ -1040,7 +1052,6 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
 		logger.info("qc_check_task:"+n);
 		/**更新qc_check_task_detail**/
-
 		n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details);
 		logger.info("更新qc_check_task_detail:"+n);
 
@@ -1359,10 +1370,17 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	}
 
 	public static void main(String args[]){
-		String str = "11,,22,";
+		String actualValueStr = "[\"1:0.03\",\"2:0\",\"3:0.34\"]";
-		System.out.println(str.split(",")[0]);
+		try {
-		System.out.println(str.split(",")[1]);
+			JSONArray codeArray = JSONArray.parseArray(actualValueStr);
-		System.out.println(str.split(",")[2]);
+			for (int c1 = 0; c1 < codeArray.size(); c1++) {
-
+				if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+					codeArray.remove(codeArray.get(c1));
+				}
+			}
+			System.out.println(codeArray.toJSONString());
+		} catch (Exception e) {
+			System.out.println();
+		}
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java

@@ -162,4 +162,10 @@ public class OdsProcureOutOrderController extends BaseController {
         String  result = odsProcureOutOrderService.addOdsProcureOutOrderTS(orderList);
         return success(result);
     }
+    //成品特殊出库
+    @PostMapping("/addwmsFpStorageNewsTS")
+    public AjaxResult addwmsFpStorageNewsTS( @RequestBody List<OdsProcureOutOrder> orderList) {
+        String  result = odsProcureOutOrderService.addwmsFpStorageNewsTS(orderList);
+        return success(result);
+    }
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java

@@ -117,4 +117,10 @@ public class WmsOdsMateStorageNewsController extends BaseController {
         List<WmsOdsMateStorageNews> list = wmsOdsMateStorageNewsService.listWmsOdsMateStorageNews(wmsOdsMateStorageNews);
         return getDataTable(list);
     }
+    @GetMapping("/listwmsFpStorageNews")
+    public TableDataInfo listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
+        startPage();
+        List<WmsOdsMateStorageNews> list = wmsOdsMateStorageNewsService.listwmsFpStorageNews(wmsOdsMateStorageNews);
+        return getDataTable(list);
+    }
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java

@@ -3,6 +3,7 @@ package com.op.wms.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.op.wms.domain.OdsProcureOutOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -105,4 +106,10 @@ public class WmsOdsMateStorageNewsSnController extends BaseController {
     public AjaxResult cardDy(@RequestBody   List<WmsOdsMateStorageNewsSn> list) {
         return success(wmsOdsMateStorageNewsSnService.cardDy(list));
     }
+    //特殊出库
+    @PostMapping("/cardBD")
+    public AjaxResult cardBD( @RequestBody List<OdsProcureOutOrder> orderList) {
+        String  result = wmsOdsMateStorageNewsSnService.cardBD(orderList);
+        return success(result);
+    }
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java

@@ -56,6 +56,12 @@ public class WmsSellOutEmbryoController extends BaseController {
         List<WmsSellOutEmbryo> list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo);
         return getDataTable(list);
     }
+    @GetMapping("/listRETS")
+    public TableDataInfo listRETS(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        startPage();
+        List<WmsSellOutEmbryo> list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREListTS(wmsSellOutEmbryo);
+        return getDataTable(list);
+    }
     /**
      * 导出成品销售出库列表
      */

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -453,7 +453,14 @@ public class WmsToWCSmissionController {
     public AjaxResult selectQueryFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
         return AjaxResult.success(wmsProductPutService.selectQueryFinishedProductSales(wmsSellOutEmbryo));
     }
-
+    /**
+     * 成品销售出库--查询接口
+     *
+     */
+    @PostMapping("/selectQueryFinishedProductSalesTS")
+    public AjaxResult selectQueryFinishedProductSalesTS(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.selectQueryFinishedProductSalesTS(wmsSellOutEmbryo));
+    }
     /**
      * 成品销售出库--提单查询接口
      *
@@ -473,6 +480,14 @@ public class WmsToWCSmissionController {
     public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
         return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo));
     }
+    /**
+     * 成品销售出库--确认接口
+     *
+     */
+    @PostMapping("/confirmFinishedProductSalesTS")
+    public AjaxResult confirmFinishedProductSalesTS(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo));
+    }
 
     /**
      * 成品销售出库----整托扫码

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -169,4 +169,6 @@ public interface OdsProcureOutOrderMapper {
     List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderSpecialByIDs(List<OdsProcureOutOrder> orderList);
 
     void updateWmsRawMissionOutById(WmsOdsMateStorageNews wmsOdsMateStorageNews);
+
+    String selectwmsFpStorageNewsTS(String formattedDate);
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java

@@ -76,4 +76,6 @@ public interface WmsOdsMateStorageNewsMapper {
     public   List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
 
     List<WmsOdsMateStorageNews> listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews);
+
+    List<WmsOdsMateStorageNews> listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews);
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java

@@ -2,10 +2,7 @@ package com.op.wms.mapper;
 
 import java.util.List;
 
-import com.op.wms.domain.WmsOdsEmStorageNews;
+import com.op.wms.domain.*;
-import com.op.wms.domain.WmsOdsMateStorageNews;
-import com.op.wms.domain.WmsOdsMateStorageNewsSn;
-import com.op.wms.domain.WmsToWCSDTO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -83,4 +80,6 @@ public interface WmsOdsMateStorageNewsSnMapper {
     public   void updateWmsOdsMateStorageNewsSnTWM(WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn);
 
     List<WmsOdsMateStorageNewsSn> cardDy(@Param("list")List<WmsOdsMateStorageNewsSn> list);
+
+    String selectWmsOdsMateStorageNewsSnBC(OdsProcureOutOrder order);
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java

@@ -87,4 +87,12 @@ public interface WmsSellOutEmbryoMapper {
     void updateWmsSellOutEmbryotwo(WmsSellOutEmbryo wmsSellOutEmbryoUpdate);
 
     List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo);
+
+    public int insertWmsSellOutEmbryoSpecial(WmsSellOutEmbryo wmsSellOutEmbryo1);
+
+
+
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoListTS(WmsSellOutEmbryo wmsSellOutEmbryo);
+
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java

@@ -84,4 +84,6 @@ public interface IOdsProcureOutOrderService {
     List<OdsProcureOutOrder> listOdsProcureOutOrderTS(OdsProcureOutOrder order);
 
     String OdsProcureOutOrderTSCK(OdsProcureOutOrder order);
+
+    String addwmsFpStorageNewsTS(List<OdsProcureOutOrder> orderList);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsService.java

@@ -64,4 +64,6 @@ public interface IWmsOdsMateStorageNewsService {
     List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
 
     List<WmsOdsMateStorageNews> listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews);
+
+    List<WmsOdsMateStorageNews> listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java

@@ -2,6 +2,7 @@ package com.op.wms.service;
 
 import java.util.List;
 
+import com.op.wms.domain.OdsProcureOutOrder;
 import com.op.wms.domain.WmsOdsMateStorageNewsSn;
 
 /**
@@ -60,4 +61,6 @@ public interface IWmsOdsMateStorageNewsSnService {
     public int deleteWmsOdsMateStorageNewsSnByMateOrderInSnId(Long mateOrderInSnId);
 
     String cardDy(List<WmsOdsMateStorageNewsSn> list);
+
+    String cardBD(List<OdsProcureOutOrder> orderList);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java

@@ -144,4 +144,6 @@ public interface IWmsProductPutService {
     ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder);
 
     String WmsProductPutByWorkOrderConfirmT(WmsProductPut wmsProductPutList);
+
+    List<WmsSellOutEmbryo> selectQueryFinishedProductSalesTS(WmsSellOutEmbryo wmsSellOutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java

@@ -85,4 +85,5 @@ public interface IWmsSellOutEmbryoService {
     String addRE(List<WmsSellOutEmbryo> wmsSellOutEmbryoList);
 
 
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -910,7 +910,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode());
         qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
         // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
-        qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode());
+        qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7());
         qcCheckTaskIncomeDTO.setIncomeTime(new Date());
         R   ruslt=   remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
 //      成功后修改--

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -11,14 +11,12 @@ import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.system.api.domain.sap.SapBackflushMPQuery;
 import com.op.system.api.domain.sap.SapMaterialPosting;
-import com.op.wms.domain.WmsOdsEmStorageNews;
+import com.op.wms.domain.*;
-import com.op.wms.domain.WmsOdsMateStorageNews;
-import com.op.wms.domain.WmsOdsMateStorageNewsSn;
 import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
+import com.op.wms.mapper.WmsSellOutEmbryoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.wms.mapper.OdsProcureOutOrderMapper;
-import com.op.wms.domain.OdsProcureOutOrder;
 import com.op.wms.service.IOdsProcureOutOrderService;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -38,6 +36,8 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
     @Autowired
     private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper;
 
+    @Autowired
+    private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper;
     /**
      * 查询包材出库单
      *
@@ -259,6 +259,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
     @Override
     @DS("#header.poolName")
     public String addOdsProcureOutOrderTS(List<OdsProcureOutOrder> orderList) {
+        String  results="操作完成";
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String key = "#header.poolName";
         String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
@@ -270,8 +271,9 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
         for (OdsProcureOutOrder order:
         orderList) {
             order.setID(IdUtils.fastSimpleUUID());
-            order.setFactoryCode(factoryCode);
+//            order.setFactoryCode(factoryCode);
             order.setActive("1");
+            order.setSiteCode(factoryCode);
             order.setProduceCode("TS"+result);
             order.setCreateDate(new Date());
             order.setUserDefined1(result);//批次
@@ -281,7 +283,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
             odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order);
         }
 
-        return null;
+        return results;
     }
 
 
@@ -392,20 +394,76 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
         }
         return result;
     }
+
+    @Override
+    @DS("#header.poolName")
+    public String addwmsFpStorageNewsTS(List<OdsProcureOutOrder> orderList) {
+        String  results="操作完成";
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String key = "#header.poolName";
+        String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        //TH    ods_procure_order_card
+        Date date = new Date();
+        String formattedDate = dateFormat.format(date);
+
+        String  result=  odsProcureOutOrderMapper.selectwmsFpStorageNewsTS(formattedDate);
+        for (OdsProcureOutOrder order:
+                orderList) {
+//            order.setID(IdUtils.fastSimpleUUID());
+//            order.setFactoryCode(factoryCode);
+//            order.setActive("1");
+//            order.setProduceCode("TS"+result);
+//            order.setCreateDate(new Date());
+//            order.setUserDefined1(result);//批次
+//            order.setOutNumber(new BigDecimal("0"));
+//            order.setCreateBy(order.getCreateBy());
+//            order.setOrderStatus("0");//0,未出库。1部分出库，2全部出库
+           // odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order);
+            WmsSellOutEmbryo wmsSellOutEmbryo1=new WmsSellOutEmbryo();
+            wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID());
+            wmsSellOutEmbryo1.setDeliveryOrder("TS"+result);//交货单号
+           // wmsSellOutEmbryo1.setAttr1(VBELN_VA);//attr1
+            wmsSellOutEmbryo1.setLotNumber(result);
+            wmsSellOutEmbryo1.setProductCode(order.getMaterialCode());
+            wmsSellOutEmbryo1.setProductName(order.getMaterialDesc());
+            wmsSellOutEmbryo1.setFactoryCode(factoryCode);
+            wmsSellOutEmbryo1.setOutQuantity(new BigDecimal("0"));
+            wmsSellOutEmbryo1.setAttr10(order.getUserDefined4());
+            wmsSellOutEmbryo1.setAttr1(order.getUserDefined6());//订单类型
+            wmsSellOutEmbryo1.setAttr3(order.getUserDefined3());//成本中心
+            wmsSellOutEmbryo1.setAttr2(order.getUserDefined2());// // 总账科目编号
+            wmsSellOutEmbryo1.setAttr5(order.getUserDefined5());//// 货架寿命到期日
+            wmsSellOutEmbryo1.setOutDate(order.getPlanDate());
+            wmsSellOutEmbryo1.setWhCode(order.getLocCode());
+            wmsSellOutEmbryo1.setPlanQuantity(order.getPlanNumber());
+            wmsSellOutEmbryo1.setUnitOfMeasure(order.getUserDefined1());
+            wmsSellOutEmbryo1.setStatus("0");//0,未出库。1部分出库，2全部出库
+            wmsSellOutEmbryo1.setSapStatus("0");
+            wmsSellOutEmbryo1.setActiveFlag("1");
+            wmsSellOutEmbryo1.setCreateBy(order.getCreateBy());
+            wmsSellOutEmbryo1.setCreateTime(new Date());
+            wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoSpecial(wmsSellOutEmbryo1);
+        }
+
+        return results;
+    }
+
     public void OutboundPostingzcSAPGYTS(List<OdsProcureOutOrder> orderList) {
-//        //先根据出库单获取
+        //先根据出库单获取
-////		* 退料的移动类型为 262
+//		* 退料的移动类型为 262
-////				* 领料的移动类型为 261-- 		and	wms_ods_procure_out_order.Order_Status='3'
+//				* 领料的移动类型为 261-- 		and	wms_ods_procure_out_order.Order_Status='3'
-//        //我把过账状态-- 		and	wms_ods_procure_out_order.User_Defined10!='2'去掉了
+        //我把过账状态-- 		and	wms_ods_procure_out_order.User_Defined10!='2'去掉了
-//        List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecialByIDs(orderList);
+        List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecialByIDs(orderList);
-//        if (orderList1.size()>0){
+        if (orderList1.size()>0){
-//            return;
+            return;
-//        }
+        }
-//        if ("成本中心".equals(orderList1.get(0).getUserDefined6())){
+
-//
+        if ("成本中心".equals(orderList1.get(0).getUserDefined6())){//区分出来内部订单
-//        }else {//内部订单
+
-//
+        }else {//内部订单
-//        }
+
+        }
 //        List<OdsProcureOutOrder> orderList2 = new ArrayList<>();//非反冲
 //        List<Map<String, Object>> mapList = new ArrayList<>();//非反冲
 //        List<SapBackflushMPQuery> sapMaterialPostingFCList = new ArrayList<>();//反冲

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java

@@ -218,6 +218,12 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS
         return wmsOdsMateStorageNewsMapper.listWmsOdsMateStorageNews(wmsOdsMateStorageNews);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public List<WmsOdsMateStorageNews> listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
+        return wmsOdsMateStorageNewsMapper.listwmsFpStorageNews(wmsOdsMateStorageNews);
+    }
+
     public String dayin(  List<OdsProcureOrder> orderList) {
         // 定义请求的URL地址
         String url = dayinUrl1;

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java

@@ -1,15 +1,20 @@
 package com.op.wms.service.impl;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.math.BigDecimal;
-import java.util.List;
+import java.text.SimpleDateFormat;
-import java.util.Map;
+import java.util.*;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.security.utils.SecurityUtils;
 import com.op.wms.domain.OdsProcureOrder;
+import com.op.wms.domain.OdsProcureOutOrder;
+import com.op.wms.domain.WmsOdsMateStorageNews;
 import com.op.wms.mapper.OdsProcureOrderMapper;
+import com.op.wms.mapper.WmsOdsMateStorageNewsMapper;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -17,6 +22,10 @@ import org.springframework.stereotype.Service;
 import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
 import com.op.wms.domain.WmsOdsMateStorageNewsSn;
 import com.op.wms.service.IWmsOdsMateStorageNewsSnService;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 包材库存明细表Service业务层处理
@@ -34,6 +43,8 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
     private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper;
     @Autowired
     private OdsProcureOrderMapper odsProcureOrderMapper;
+    @Autowired
+    private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper;
     /**
      * 查询包材库存明细表
      *
@@ -128,6 +139,113 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
         return result;
     }
 
+    /**
+     * Unit
+     * :
+     * "ST"
+     * locCode
+     * :
+     * "WH02"
+     * materialCode
+     * :
+     * "40000015051"
+     * materialDesc
+     * :
+     * "榄菊加大盘野菊花蚊香塑料筒装(18装)(36单圈)纸箱(2201)"
+     * planNumber
+     * :
+     * "200"
+     * @param orderList
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    public String cardBD(List<OdsProcureOutOrder> orderList) {//
+        //获取当前所选工厂
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String key = "#header.poolName";
+        String  msg="补打成功";
+        String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
+        for (OdsProcureOutOrder order:
+        orderList) {
+        //入参是物料，仓库，库区，数量，生成标识卡，
+           String   BC= wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnBC(order);
+            List<OdsProcureOrder> dtos0=new ArrayList<>();
+            String  setid=IdUtils.fastSimpleUUID();//
+            OdsProcureOrder odsProcureOrder=    new OdsProcureOrder();
+            odsProcureOrder.setFactoryCode(factoryCode);
+            odsProcureOrder.setSiteCode(factoryCode);
+            odsProcureOrder.setProcureCode(order.getMaterialCode());//
+            //pw.setUserDefined3(order.getUserDefined3());//行项目
+            odsProcureOrder.setMaterialCode(order.getMaterialCode());
+            odsProcureOrder.setMaterialDesc(order.getMaterialDesc());
+            odsProcureOrder.setPlanNumber(order.getPlanNumber());
+            odsProcureOrder.setSupplierCode(order.getUserDefined2());
+            odsProcureOrder.setSupplierName(order.getUserDefined3());
+            odsProcureOrder.setUserDefined8("2");
+            odsProcureOrder.setUserDefined7(BC);//批次--我直接取已经有的批次
+            odsProcureOrder.setUserDefined10("0");//标识卡状态0是未收货的
+            odsProcureOrder.setUserDefined11(order.getUserDefined4());
+           // odsProcureOrder.setUserDefined4();//id
+            odsProcureOrder.setUnit(order.getUnit());
+            odsProcureOrder.setCardNum("1");
+            odsProcureOrder.setPlanNumber(order.getPlanNumber());
+            // String  dateString = pw.getUserDefined11().replace("-", "");
+         String   materialCode = order.getMaterialCode().replaceFirst("^0{7}", ""); // 只替换开头的7个0
+            odsProcureOrder.setUserDefined1(materialCode+"-"+setid+"-"+"1");
+            odsProcureOrder.setCreateTime(new Date());
+            odsProcureOrder.setActive("1");
+            dtos0.add(odsProcureOrder);
+            odsProcureOrderMapper.addBatchPallet(dtos0);
+
+            WmsOdsMateStorageNews wmsOdsMateStorageNews3 = new WmsOdsMateStorageNews();
+            wmsOdsMateStorageNews3.setStorageId(IdUtils.fastSimpleUUID());
+            wmsOdsMateStorageNews3.setWhCode(order.getLocCode());
+            wmsOdsMateStorageNews3.setWlCode(odsProcureOrder.getUserDefined1());
+            wmsOdsMateStorageNews3.setWaCode(order.getWaCode());
+            wmsOdsMateStorageNews3.setAmount(order.getPlanNumber());
+//                wmsOdsMateStorageNews3.setStorageAmount(odsProcureOutOrder.getPlanNumber());
+            wmsOdsMateStorageNews3.setMaterialCode(order.getMaterialCode());
+            wmsOdsMateStorageNews3.setMaterialDesc(order.getMaterialDesc());
+            wmsOdsMateStorageNews3.setStorageType("BC");
+            wmsOdsMateStorageNews3.setCreateBy(SecurityUtils.getUsername());
+            wmsOdsMateStorageNews3.setGmtCreate(new Date());
+            wmsOdsMateStorageNews3.setActiveFlag("1");
+            wmsOdsMateStorageNews3.setFactoryCode(factoryCode);
+            wmsOdsMateStorageNews3.setSapFactoryCode(factoryCode);
+            wmsOdsMateStorageNews3.setUserDefined1(order.getUnit());//单位
+            wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews3);
+            WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn();
+            wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID());
+            wmsOdsMateStorageNewsSn.setWhCode(order.getLocCode());//仓库编码
+            // wmsOdsMateStorageNewsSn.setWaCode(pw.getUserDefined1());
+            wmsOdsMateStorageNewsSn.setWlCode(odsProcureOrder.getUserDefined1());//库位编码
+            wmsOdsMateStorageNewsSn.setSn(odsProcureOrder.getUserDefined1());
+            wmsOdsMateStorageNewsSn.setMaterialCode(order.getMaterialCode());
+            wmsOdsMateStorageNewsSn.setMaterialDesc(order.getMaterialDesc());
+           // wmsOdsMateStorageNewsSn.setSn(order.getUserDefined1());
+            wmsOdsMateStorageNewsSn.setAmount(order.getPlanNumber());
+            wmsOdsMateStorageNewsSn.setWaCode(order.getWaCode());
+            wmsOdsMateStorageNewsSn.setCreateBy(SecurityUtils.getUsername());
+            wmsOdsMateStorageNewsSn.setGmtCreate(new Date());
+            wmsOdsMateStorageNewsSn.setUserDefined2(BC);//批次
+            wmsOdsMateStorageNewsSn.setUserDefined1("RK");
+            wmsOdsMateStorageNewsSn.setUserDefined3("1");//0是暂收，1是真收
+            wmsOdsMateStorageNewsSn.setFactoryCode(factoryCode);
+            wmsOdsMateStorageNewsSn.setSapFactoryCode(factoryCode);
+            wmsOdsMateStorageNewsSn.setActiveFlag("1");
+            wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn);
+            for (OdsProcureOrder    order1:
+                    dtos0 ) {
+                String materialCode1=   order1.getMaterialCode();//000000040000004873
+                materialCode1 = materialCode1.replaceFirst("^0{7}", ""); // 只替换开头的7个0
+                order1.setMaterialCode(materialCode1);
+            }
+             msg=   dayin(dtos0);
+        }
+            return msg;
+    }
+
     public String dayin(  List<OdsProcureOrder> orderList) {
         // 定义请求的URL地址
         String url = dayinUrl1;

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -297,15 +297,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                         map.put("ERFME", wmsProductPut3.getUnitOfMeasure());
                         map.put("BATCH", wmsProductPut3.getAttr4());
                         map.put("STCK_TYPE", wmsProductPut1.getAttr3());
-                        //map.put("BATCH", wmsProductPut3.getBatchNumber());
+
-//                        if (wmsProductPut3.getBatchNumber().length()>12){
+                        if (wmsProductPut3.getBatchNumber().length()==24){
-//                            //String batch = mesReportWork.getBatch().substring(12);
+
-//                            String batch  = InterceptionRules(wmsProductPut3.getBatchNumber());
+                            String HSDAT  = InterceptionSJRules(wmsProductPut3.getBatchNumber());
-//                            map.put("BATCH", batch);
+                            map.put("HSDAT", HSDAT);
-//                        }else {
+                        }else {
-//                            map.put("BATCH", wmsProductPut3.getBatchNumber());
+                            map.put("HSDAT", wmsProductPut3.getProductDate());
-//                        }
+                        }
-                        map.put("HSDAT", wmsProductPut3.getProductDate());
+
                         mapList.add(map);
                     }
                     R result = remoteSapService.sapOrderReceipt(mapList);
@@ -516,7 +516,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("ERFME", mesReportWork.getUnit());
                 map.put("BATCH", mesReportWork.getBatchSK());
                 map.put("STCK_TYPE", selectedType);
-                if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
+                if (mesReportWork.getBatch().length()==24){
                     //String batch = mesReportWork.getBatch().substring(12);
                     String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
                     map.put("HSDAT", HSDAT);
@@ -559,7 +559,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("ERFME", mesReportWork.getUnit());
                 map.put("BATCH", mesReportWork.getBatchSK());
                 map.put("STCK_TYPE", selectedType);
-                if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
+                if (mesReportWork.getBatch().length()==24){
                     //String batch = mesReportWork.getBatch().substring(12);
                     String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
                     map.put("HSDAT", HSDAT);
@@ -1250,6 +1250,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         return SUCCESS;
     }
 
+    @Override
+    public List<WmsSellOutEmbryo> selectQueryFinishedProductSalesTS(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        //wms_sell_out_embryo
+        DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode());
+        wmsSellOutEmbryo.setActiveFlag("1");
+        List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=     wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListTS(wmsSellOutEmbryo);
+        return wmsSellOutEmbryoList;
+    }
+
     @Override
     public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
         DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java

@@ -44,6 +44,7 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
         List<WmsRawOrderIn> wmsRawOrderInList=  wmsRawOrderInMapper.selectWmsRawOrderInList(wmsRawOrderIn);
         for (WmsRawOrderIn  wmsRawOrderIn1:
         wmsRawOrderInList) {
+       wmsRawOrderIn1.setUserDefined6( wmsRawOrderIn1.getPoNo()+wmsRawOrderIn1.getUserDefined7());
        String     checkResult  = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn1);
        wmsRawOrderIn1.setQualityStatus(checkResult);
         }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java

@@ -193,7 +193,11 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
         return null;
     }
 
-
+    @Override
+    @DS("#header.poolName")
+    public List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREListTS(wmsSellOutEmbryo);
+    }
 
 
     public List<WmsSellOutEmbryo> dayin(  ) {

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -1515,6 +1515,7 @@
 			<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1  like concat('%', #{userDefined1}, '%')</if>
 			<if test="userDefined2 != null  and userDefined2 != ''"> and User_Defined2 = #{userDefined2}</if>
 			<if test="userDefined3 != null  and userDefined3 != ''"> and User_Defined3  like concat('%', #{userDefined3}, '%')</if>
+			<if test="userDefined4 != null  and userDefined4 != ''"> and User_Defined4  like concat('%', #{userDefined4}, '%')</if>
 			<if test="sn != null  and sn != ''"> and sn = #{sn}</if>
 			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
 			<if test="createDate != null "> and gmt_create = #{createDate}</if>
@@ -1761,6 +1762,17 @@
 		WHERE
 			User_Defined1 LIKE CONCAT('%', #{formattedDate}, '%');
 	</select>
+	<select id="selectwmsFpStorageNewsTS"		resultType="java.lang.String">
+		SELECT
+			COALESCE(
+						MAX(TRY_CAST(lot_number AS BIGINT)) + 1,  -- 使用 BIGINT 以避免溢出
+						CAST(CONCAT(#{formattedDate}, '0001') AS BIGINT)  -- 同样使用 BIGINT
+				) AS Result_Value
+		FROM
+			wms_sell_out_embryo_special
+		WHERE
+			lot_number LIKE CONCAT('%', #{formattedDate}, '%');
+	</select>
 	<select id="selectWmsOdsProcureOutOrderSpecial"	parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		SELECT
 		Site_code,

op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml

@@ -416,4 +416,17 @@
         <if test="materialCode != null">material_code = #{materialCode}</if>
         </where>
     </select>
+
+    <select id="listwmsFpStorageNews" parameterType="WmsOdsMateStorageNews"
+            resultMap="WmsOdsMateStorageNewsResult">
+        SELECT DISTINCT
+        product_code    AS  material_code,
+        product_name    AS  material_desc,
+        user_defined1
+        FROM
+        wms_fp_storage_news
+        <where>
+            <if test="materialCode != null">product_code = #{materialCode}</if>
+        </where>
+    </select>
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml

@@ -392,4 +392,15 @@
         </where>
 
     </select>
+    <select id="selectWmsOdsMateStorageNewsSnBC"    resultType="java.lang.String">
+        SELECT TOP
+            1 user_defined2
+        FROM
+            wms_ods_mate_storage_news_sn
+        WHERE
+            material_code LIKE concat ( '%', #{ materialCode }, '%' )
+        ORDER BY
+            gmt_create DESC;
+
+    </select>
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml

@@ -66,68 +66,125 @@
 	</sql>
 
     <select id="selectWmsRawOrderInList" parameterType="WmsRawOrderIn" resultMap="WmsRawOrderInResult">
-        <include refid="selectWmsRawOrderInVo"/>
+        SELECT
+        wms_raw_order_in.raw_order_in_id,
+        wms_raw_order_in.factory_code,
+        wms_raw_order_in.wh_code,
+        wms_raw_order_in.wa_code,
+        wms_raw_order_in.wl_code,
+        wms_raw_order_in.order_in_type,
+        wms_raw_order_in.order_no,
+        wms_raw_order_in.dn_no,
+        wms_raw_order_in.po_no,
+        wms_raw_order_in.po_line,
+        wms_raw_order_in.po_type,
+        wms_raw_order_in.material_code,
+        wms_raw_order_in.material_desc,
+        wms_raw_order_in.unit,
+        wms_raw_order_in.buyer_group,
+        wms_raw_order_in.supply_code,
+        wms_raw_order_in.sap_factory_code,
+        wms_raw_order_in.send_spot,
+        wms_raw_order_in.request_amount,
+        wms_raw_order_in.receipt_amount,
+        wms_raw_order_in.shelves_amount,
+        wms_raw_order_in.location,
+        wms_raw_order_in.request_time,
+        wms_raw_order_in.quality_status,
+        wms_raw_order_in.order_status,
+        wms_raw_order_in.receipt_operator,
+        wms_raw_order_in.receipt_time,
+        wms_raw_order_in.shelves_operator,
+        wms_raw_order_in.return_amount,
+        wms_raw_order_in.return_name,
+        wms_raw_order_in.return_time,
+        wms_raw_order_in.return_status,
+        wms_raw_order_in.shelves_time,
+        wms_raw_order_in.return_message,
+        wms_raw_order_in.accounting_status,
+        wms_raw_order_in.accounting_time,
+        wms_raw_order_in.accounting_message,
+        wms_raw_order_in.user_defined1,
+        wms_raw_order_in.user_defined2,
+        wms_raw_order_in.user_defined3,
+        wms_raw_order_in.user_defined4,
+        wms_raw_order_in.user_defined5,
+        wms_raw_order_in.user_defined6,
+        wms_raw_order_in.user_defined8,
+        wms_raw_order_in.user_defined9,
+        wms_raw_order_in.user_defined10,
+        wms_raw_order_in.create_by,
+        wms_raw_order_in.gmt_create,
+        wms_raw_order_in.last_modified_by,
+        wms_raw_order_in.gmt_modified,
+        ods_procure_order.User_Defined7 user_defined7,
+        wms_raw_order_in.active_flag
+        FROM
+        wms_raw_order_in
+        LEFT JOIN ods_procure_order ON wms_raw_order_in.order_no	= ods_procure_order.User_Defined5
+        AND wms_raw_order_in.po_no= ods_procure_order.Procure_Code
+        AND wms_raw_order_in.po_line= ods_procure_order.User_Defined3
         <where>
-            <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            <if test="factoryCode != null  and factoryCode != ''">and wms_raw_order_in.factory_code = #{factoryCode}</if>
-            <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
+            <if test="whCode != null  and whCode != ''">and wms_raw_order_in.wh_code = #{whCode}</if>
-            <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
+            <if test="waCode != null  and waCode != ''">and wms_raw_order_in.wa_code = #{waCode}</if>
-            <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
+            <if test="wlCode != null  and wlCode != ''">and wms_raw_order_in.wl_code = #{wlCode}</if>
-            <if test="orderInType != null  and orderInType != ''">and order_in_type = #{orderInType}</if>
+            <if test="orderInType != null  and orderInType != ''">and wms_raw_order_in.order_in_type = #{orderInType}</if>
-            <if test="orderNo != null  and orderNo != ''">and order_no = #{orderNo}</if>
+            <if test="orderNo != null  and orderNo != ''">and wms_raw_order_in.order_no = #{orderNo}</if>
-            <if test="dnNo != null  and dnNo != ''">and dn_no = #{dnNo}</if>
+            <if test="dnNo != null  and dnNo != ''">and wms_raw_order_in.dn_no = #{dnNo}</if>
-            <if test="poNo != null  and poNo != ''">and po_no = #{poNo}</if>
+            <if test="poNo != null  and poNo != ''">and wms_raw_order_in.po_no = #{poNo}</if>
-            <if test="poLine != null  and poLine != ''">and po_line = #{poLine}</if>
+            <if test="poLine != null  and poLine != ''">and wms_raw_order_in.po_line = #{poLine}</if>
-            <if test="poType != null  and poType != ''">and po_type = #{poType}</if>
+            <if test="poType != null  and poType != ''">and wms_raw_order_in.po_type = #{poType}</if>
-            <if test="materialCode != null  and materialCode != ''">and material_code like concat('%', #{materialCode},
+            <if test="materialCode != null  and materialCode != ''">and wms_raw_order_in.material_code like concat('%', #{materialCode},
                 '%')  </if>
-            <if test="materialDesc != null  and materialDesc != ''">and material_desc like concat('%', #{materialDesc},
+            <if test="materialDesc != null  and materialDesc != ''">and wms_raw_order_in.material_desc like concat('%', #{materialDesc},
                 '%') </if>
-            <if test="unit != null  and unit != ''">and unit = #{unit}</if>
+            <if test="unit != null  and unit != ''">and wms_raw_order_in.unit = #{unit}</if>
-            <if test="buyerGroup != null  and buyerGroup != ''">and buyer_group = #{buyerGroup}</if>
+            <if test="buyerGroup != null  and buyerGroup != ''">and wms_raw_order_in.buyer_group = #{buyerGroup}</if>
-            <if test="supplyCode != null  and supplyCode != ''">and supply_code like concat('%', #{supplyCode}, '%')
+            <if test="supplyCode != null  and supplyCode != ''">and wms_raw_order_in.supply_code like concat('%', #{supplyCode}, '%')
             </if>
-            <if test="sapFactoryCode != null  and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
+            <if test="sapFactoryCode != null  and sapFactoryCode != ''">and wms_raw_order_in.sap_factory_code = #{sapFactoryCode}</if>
-            <if test="sendSpot != null  and sendSpot != ''">and send_spot = #{sendSpot}</if>
+            <if test="sendSpot != null  and sendSpot != ''">and wms_raw_order_in.send_spot = #{sendSpot}</if>
-            <if test="requestAmount != null ">and request_amount = #{requestAmount}</if>
+            <if test="requestAmount != null ">and wms_raw_order_in.request_amount = #{requestAmount}</if>
-            <if test="receiptAmount != null ">and receipt_amount = #{receiptAmount}</if>
+            <if test="receiptAmount != null ">and wms_raw_order_in.receipt_amount = #{receiptAmount}</if>
-            <if test="shelvesAmount != null ">and shelves_amount = #{shelvesAmount}</if>
+            <if test="shelvesAmount != null ">and wms_raw_order_in.shelves_amount = #{shelvesAmount}</if>
-            <if test="location != null  and location != ''">and location = #{location}</if>
+            <if test="location != null  and location != ''">and wms_raw_order_in.location = #{location}</if>
-            <if test="requestTime != null ">and request_time = #{requestTime}</if>
+            <if test="requestTime != null ">and wms_raw_order_in.request_time = #{requestTime}</if>
-            <if test="qualityStatus != null  and qualityStatus != ''">and quality_status = #{qualityStatus}</if>
+            <if test="qualityStatus != null  and qualityStatus != ''">and wms_raw_order_in.quality_status = #{qualityStatus}</if>
-            <if test="orderStatus != null  and orderStatus != ''">and order_status = #{orderStatus}</if>
+            <if test="orderStatus != null  and orderStatus != ''">and wms_raw_order_in.order_status = #{orderStatus}</if>
-            <if test="receiptOperator != null  and receiptOperator != ''">and receipt_operator = #{receiptOperator}</if>
+            <if test="receiptOperator != null  and receiptOperator != ''">and wms_raw_order_in.receipt_operator = #{receiptOperator}</if>
-            <if test="receiptTime != null ">and receipt_time = #{receiptTime}</if>
+            <if test="receiptTime != null ">and wms_raw_order_in.receipt_time = #{receiptTime}</if>
-            <if test="shelvesOperator != null  and shelvesOperator != ''">and shelves_operator = #{shelvesOperator}</if>
+            <if test="shelvesOperator != null  and shelvesOperator != ''">and wms_raw_order_in.shelves_operator = #{shelvesOperator}</if>
-            <if test="returnAmount != null ">and return_amount = #{returnAmount}</if>
+            <if test="returnAmount != null ">and wms_raw_order_in.return_amount = #{returnAmount}</if>
-            <if test="returnName != null  and returnName != ''">and return_name like concat('%', #{returnName}, '%')
+            <if test="returnName != null  and returnName != ''">and wms_raw_order_in.return_name like concat('%', #{returnName}, '%')
             </if>
-            <if test="returnTime != null ">and return_time = #{returnTime}</if>
+            <if test="returnTime != null ">and wms_raw_order_in.return_time = #{returnTime}</if>
-            <if test="returnStatus != null  and returnStatus != ''">and return_status = #{returnStatus}</if>
+            <if test="returnStatus != null  and returnStatus != ''">and wms_raw_order_in.return_status = #{returnStatus}</if>
-            <if test="shelvesTime != null ">and shelves_time = #{shelvesTime}</if>
+            <if test="shelvesTime != null ">and wms_raw_order_in.shelves_time = #{shelvesTime}</if>
-            <if test="returnMessage != null  and returnMessage != ''">and return_message = #{returnMessage}</if>
+            <if test="returnMessage != null  and returnMessage != ''">and wms_raw_order_in.return_message = #{returnMessage}</if>
-            <if test="accountingStatus != null  and accountingStatus != ''">and accounting_status =
+            <if test="accountingStatus != null  and accountingStatus != ''">and wms_raw_order_in.accounting_status =
                 #{accountingStatus}
             </if>
-            <if test="accountingTime != null ">and accounting_time = #{accountingTime}</if>
+            <if test="accountingTime != null ">and wms_raw_order_in.accounting_time = #{accountingTime}</if>
-            <if test="accountingMessage != null  and accountingMessage != ''">and accounting_message =
+            <if test="accountingMessage != null  and accountingMessage != ''">and wms_raw_order_in.accounting_message =
                 #{accountingMessage}
             </if>
-            <if test="userDefined1 != null  and userDefined1 != ''">and user_defined1 = #{userDefined1}</if>
+            <if test="userDefined1 != null  and userDefined1 != ''">and wms_raw_order_in.user_defined1 = #{userDefined1}</if>
-            <if test="userDefined2 != null  and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
+            <if test="userDefined2 != null  and userDefined2 != ''">and wms_raw_order_in.user_defined2 = #{userDefined2}</if>
-            <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
+            <if test="userDefined3 != null  and userDefined3 != ''">and wms_raw_order_in.user_defined3 = #{userDefined3}</if>
-            <if test="userDefined4 != null  and userDefined4 != ''">and user_defined4 = #{userDefined4}</if>
+            <if test="userDefined4 != null  and userDefined4 != ''">and wms_raw_order_in.user_defined4 = #{userDefined4}</if>
-            <if test="userDefined5 != null  and userDefined5 != ''">and user_defined5 = #{userDefined5}</if>
+            <if test="userDefined5 != null  and userDefined5 != ''">and wms_raw_order_in.user_defined5 = #{userDefined5}</if>
-            <if test="userDefined6 != null  and userDefined6 != ''">and user_defined6 = #{userDefined6}</if>
+            <if test="userDefined6 != null  and userDefined6 != ''">and wms_raw_order_in.user_defined6 = #{userDefined6}</if>
-            <if test="userDefined7 != null  and userDefined7 != ''">and user_defined7 = #{userDefined7}</if>
+            <if test="userDefined7 != null  and userDefined7 != ''">and wms_raw_order_in.user_defined7 = #{userDefined7}</if>
-            <if test="userDefined8 != null  and userDefined8 != ''">and user_defined8 = #{userDefined8}</if>
+            <if test="userDefined8 != null  and userDefined8 != ''">and wms_raw_order_in.user_defined8 = #{userDefined8}</if>
-            <if test="userDefined9 != null  and userDefined9 != ''">and user_defined9 = #{userDefined9}</if>
+            <if test="userDefined9 != null  and userDefined9 != ''">and wms_raw_order_in.user_defined9 = #{userDefined9}</if>
-            <if test="userDefined10 != null  and userDefined10 != ''">and user_defined10 = #{userDefined10}</if>
+            <if test="userDefined10 != null  and userDefined10 != ''">and wms_raw_order_in.user_defined10 = #{userDefined10}</if>
-            <if test="gmtCreate != null ">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtCreate != null ">and wms_raw_order_in.gmt_create = #{gmtCreate}</if>
-            <if test="lastModifiedBy != null  and lastModifiedBy != ''">and last_modified_by = #{lastModifiedBy}</if>
+            <if test="lastModifiedBy != null  and lastModifiedBy != ''">and wms_raw_order_in.last_modified_by = #{lastModifiedBy}</if>
-            <if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
+            <if test="gmtModified != null ">and wms_raw_order_in.gmt_modified = #{gmtModified}</if>
-            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and wms_raw_order_in.active_flag = #{activeFlag}</if>
         </where>
-        ORDER BY	gmt_create	DESC
+        ORDER BY	wms_raw_order_in.gmt_create	DESC
     </select>
 
     <select id="selectWmsRawOrderInByRawOrderInId" parameterType="String" resultMap="WmsRawOrderInResult">
@@ -423,7 +480,7 @@
         FROM
             qc_check_task
         WHERE
-            order_no = #{poNo}
+            order_no = #{userDefined6}
           AND material_code  like concat('%', #{materialCode}, '%')
     </select>
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml

@@ -127,6 +127,84 @@
         </where>
         ORDER BY	create_time	DESC
     </select>
+    <select id="selectWmsSellOutEmbryoListTS" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
+        SELECT
+        id,
+        delivery_order,
+        Item_number,
+        active_flag,
+        factory_code,
+        wh_code,
+        wa_code,
+        wl_code,
+        delivery_place,
+        product_name,
+        product_code,
+        product_sort,
+        specification,
+        unit_of_measure,
+        lot_number,
+        plan_quantity,
+        out_quantity,
+        status,
+        SAP_status,
+        SAP_proof,
+        SAP_message,
+        out_date,
+        attr1,
+        attr2,
+        attr3,
+        attr4,
+        attr5,
+        attr6,
+        attr7,
+        attr8,
+        attr9,
+        attr10,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark
+        FROM
+        wms_sell_out_embryo_special
+        <where>
+            <if test="deliveryOrder != null  and deliveryOrder != ''">and delivery_order = #{deliveryOrder}</if>
+            <if test="itemNumber != null  and itemNumber != ''">and Item_number = #{itemNumber}</if>
+            <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
+            <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
+            <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
+            <if test="deliveryPlace != null  and deliveryPlace != ''">and delivery_place = #{deliveryPlace}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+            <if test="productSort != null  and productSort != ''">and product_sort = #{productSort}</if>
+            <if test="specification != null  and specification != ''">and specification = #{specification}</if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''">and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="lotNumber != null  and lotNumber != ''">and lot_number = #{lotNumber}</if>
+            <if test="planQuantity != null ">and plan_quantity = #{planQuantity}</if>
+            <if test="outQuantity != null ">and out_quantity = #{outQuantity}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="sapStatus != null  and sapStatus != ''">and SAP_status = #{sapStatus}</if>
+            <if test="sapProof != null  and sapProof != ''">and SAP_proof = #{sapProof}</if>
+            <if test="sapMessage != null  and sapMessage != ''">and SAP_message = #{sapMessage}</if>
+            <if test="outDate != null ">and out_date = #{outDate}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
+            <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
+            <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
+            <if test="attr4 != null  and attr4 != ''">and attr4 = #{attr4}</if>
+            <if test="attr5 != null  and attr5 != ''">and attr5 = #{attr5}</if>
+            <if test="attr6 != null  and attr6 != ''">and attr6 = #{attr6}</if>
+            <if test="attr7 != null  and attr7 != ''">and attr7 = #{attr7}</if>
+            <if test="attr8 != null  and attr8 != ''">and attr8 = #{attr8}</if>
+            <if test="attr9 != null  and attr9 != ''">and attr9 = #{attr9}</if>
+            <if test="attr10 != null  and attr10 != ''">and attr10 = #{attr10}</if>
+        </where>
+        ORDER BY	create_time	DESC
+    </select>
     <select id="selectWmsSellOutEmbryoREList" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
         SELECT
         id,
@@ -316,7 +394,89 @@
             <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
-
+    <insert id="insertWmsSellOutEmbryoSpecial" parameterType="WmsSellOutEmbryo">
+        insert into wms_sell_out_embryo_special
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="deliveryOrder != null">delivery_order,</if>
+            <if test="itemNumber != null">Item_number,</if>
+            <if test="factoryCode != null">factory_code,</if>
+            <if test="whCode != null">wh_code,</if>
+            <if test="waCode != null">wa_code,</if>
+            <if test="wlCode != null">wl_code,</if>
+            <if test="deliveryPlace != null">delivery_place,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="productCode != null">product_code,</if>
+            <if test="productSort != null">product_sort,</if>
+            <if test="specification != null">specification,</if>
+            <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="lotNumber != null">lot_number,</if>
+            <if test="planQuantity != null">plan_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="status != null">status,</if>
+            <if test="sapStatus != null">SAP_status,</if>
+            <if test="sapProof != null">SAP_proof,</if>
+            <if test="sapMessage != null">SAP_message,</if>
+            <if test="outDate != null">out_date,</if>
+            <if test="attr1 != null">attr1,</if>
+            <if test="attr2 != null">attr2,</if>
+            <if test="attr3 != null">attr3,</if>
+            <if test="attr4 != null">attr4,</if>
+            <if test="attr5 != null">attr5,</if>
+            <if test="attr6 != null">attr6,</if>
+            <if test="attr7 != null">attr7,</if>
+            <if test="attr8 != null">attr8,</if>
+            <if test="attr9 != null">attr9,</if>
+            <if test="attr10 != null">attr10,</if>
+            <if test="attr11 != null">attr11,</if>
+            <if test="attr12 != null">attr12,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="deliveryOrder != null">#{deliveryOrder},</if>
+            <if test="itemNumber != null">#{itemNumber},</if>
+            <if test="factoryCode != null">#{factoryCode},</if>
+            <if test="whCode != null">#{whCode},</if>
+            <if test="waCode != null">#{waCode},</if>
+            <if test="wlCode != null">#{wlCode},</if>
+            <if test="deliveryPlace != null">#{deliveryPlace},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="productCode != null">#{productCode},</if>
+            <if test="productSort != null">#{productSort},</if>
+            <if test="specification != null">#{specification},</if>
+            <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="lotNumber != null">#{lotNumber},</if>
+            <if test="planQuantity != null">#{planQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="status != null">#{status},</if>
+            <if test="sapStatus != null">#{sapStatus},</if>
+            <if test="sapProof != null">#{sapProof},</if>
+            <if test="sapMessage != null">#{sapMessage},</if>
+            <if test="outDate != null">#{outDate},</if>
+            <if test="attr1 != null">#{attr1},</if>
+            <if test="attr2 != null">#{attr2},</if>
+            <if test="attr3 != null">#{attr3},</if>
+            <if test="attr4 != null">#{attr4},</if>
+            <if test="attr5 != null">#{attr5},</if>
+            <if test="attr6 != null">#{attr6},</if>
+            <if test="attr7 != null">#{attr7},</if>
+            <if test="attr8 != null">#{attr8},</if>
+            <if test="attr9 != null">#{attr9},</if>
+            <if test="attr10 != null">#{attr10},</if>
+            <if test="attr11 != null">#{attr11},</if>
+            <if test="attr12 != null">#{attr12},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
     <update id="updateWmsSellOutEmbryo" parameterType="WmsSellOutEmbryo">
         update wms_sell_out_embryo
         <trim prefix="SET" suffixOverrides=",">
@@ -569,7 +729,86 @@
         </trim>
         where id = #{id}
     </update>
+    <select id="selectWmsSellOutEmbryoREListTS" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
 
+        SELECT
+        id,
+        delivery_order,
+        Item_number,
+        active_flag,
+        factory_code,
+        wh_code,
+        wa_code,
+        wl_code,
+        delivery_place,
+        product_name,
+        product_code,
+        product_sort,
+        specification,
+        unit_of_measure,
+        lot_number,
+        plan_quantity,
+        out_quantity,
+        status,
+        SAP_status,
+        SAP_proof,
+        SAP_message,
+        out_date,
+        attr1,
+        attr2,
+        attr3,
+        attr4,
+        attr5,
+        attr6,
+        attr7,
+        attr8,
+        attr9,
+        attr10,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark
+        FROM
+        wms_sell_out_embryo_special
+            <where>
+                <if test="deliveryOrder != null  and deliveryOrder != ''">and delivery_order = #{deliveryOrder}</if>
+                <if test="itemNumber != null  and itemNumber != ''">and Item_number = #{itemNumber}</if>
+                <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+                <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
+                <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
+                <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
+                <if test="deliveryPlace != null  and deliveryPlace != ''">and delivery_place = #{deliveryPlace}</if>
+                <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                    '%')
+                </if>
+                <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+                <if test="productSort != null  and productSort != ''">and product_sort = #{productSort}</if>
+                <if test="specification != null  and specification != ''">and specification = #{specification}</if>
+                <if test="unitOfMeasure != null  and unitOfMeasure != ''">and unit_of_measure = #{unitOfMeasure}</if>
+                <if test="lotNumber != null  and lotNumber != ''">and lot_number = #{lotNumber}</if>
+                <if test="planQuantity != null ">and plan_quantity = #{planQuantity}</if>
+                <if test="outQuantity != null ">and out_quantity = #{outQuantity}</if>
+                <if test="status != null  and status != ''">and status = #{status}</if>
+                <if test="sapStatus != null  and sapStatus != ''">and SAP_status = #{sapStatus}</if>
+                <if test="sapProof != null  and sapProof != ''">and SAP_proof = #{sapProof}</if>
+                <if test="sapMessage != null  and sapMessage != ''">and SAP_message = #{sapMessage}</if>
+                <if test="outDate != null ">and out_date = #{outDate}</if>
+                <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+                <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
+                <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
+                <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
+                <if test="attr4 != null  and attr4 != ''">and attr4 = #{attr4}</if>
+                <if test="attr5 != null  and attr5 != ''">and attr5 = #{attr5}</if>
+                <if test="attr6 != null  and attr6 != ''">and attr6 = #{attr6}</if>
+                <if test="attr7 != null  and attr7 != ''">and attr7 = #{attr7}</if>
+                <if test="attr8 != null  and attr8 != ''">and attr8 = #{attr8}</if>
+                <if test="attr9 != null  and attr9 != ''">and attr9 = #{attr9}</if>
+                <if test="attr10 != null  and attr10 != ''">and attr10 = #{attr10}</if>
+            </where>
+            ORDER BY	create_time	DESC
+
+    </select>
 
 
 </mapper>