wms报错修改

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java

@@ -81,7 +81,9 @@ public class MesReportWork extends BaseEntity {
 	/** 物料消耗数量 */
 	@Excel(name = "物料消耗数量")
 	private BigDecimal quantity;
-
+	/** 物料消耗数量 */
+	@Excel(name = "入库数量")
+	private BigDecimal RKquantity;
 	/** 物料消耗数量 */
 	@Excel(name = "物料消耗单位")
 	private String materialNameUnit;
@@ -218,6 +220,14 @@ public class MesReportWork extends BaseEntity {
 		return checkResult;
 	}
 
+	public BigDecimal getRKquantity() {
+		return RKquantity;
+	}
+
+	public void setRKquantity(BigDecimal RKquantity) {
+		this.RKquantity = RKquantity;
+	}
+
 	public void setCheckResult(String checkResult) {
 		this.checkResult = checkResult;
 	}

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

@@ -246,4 +246,6 @@ public interface MesReportWorkMapper {
     int deleteConsume(@Param("list") List<MesReportWorkConsume> list);
 
     List<MesReportWorkConsume> getClearConsum(String workorderCode);
+
+    BigDecimal selectWmsProductPut(MesReportWork mesReportWork1);
 }

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

@@ -161,6 +161,10 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 	@DS("#header.poolName")
 	public List<MesReportWork> getReportWorkHzList(MesReportWork mesReportWork) {
 		List<MesReportWork> dtos = mesReportWorkMapper.getReportWorkHzList(mesReportWork);
+		for (MesReportWork	mesReportWork1:dtos){
+			BigDecimal	RK=	mesReportWorkMapper.selectWmsProductPut(mesReportWork1);
+			mesReportWork1.setRKquantity(RK);
+		}
 		return dtos;
 	}
 

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

@@ -1765,4 +1765,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			create_time = #{item.attr2}
 		</foreach>
 	</delete>
+	<select id="selectWmsProductPut"	resultType="java.math.BigDecimal">
+		SELECT
+			SUM( put_quantity )
+		FROM
+			wms_product_put
+		WHERE
+			product_order = #{workorderCodeSap}
+		  AND product_code = #{productCode}
+	</select>
 </mapper>

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

@@ -913,8 +913,8 @@ public class WmsToWCSmissionController {
     //用于一键退货入库--入参procureCode
     @PostMapping("/selectOrderCardTLTWO")
     public AjaxResult selectOrderCardTLTWO(@RequestBody OdsProcureOrder odsProcureOrder) {
-        OdsProcureOrder odsProcureOrder1 = odsProcureOrderService.selectOrderCardTLTWO(odsProcureOrder);
+        List<OdsProcureOrder>  orderList = odsProcureOrderService.selectOrderCardTLTWO(odsProcureOrder);
-        return success(odsProcureOrder1);
+        return success(orderList);
     }
     //
     @PostMapping("/addOrderCard")

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

@@ -128,5 +128,5 @@ public interface OdsProcureOrderMapper {
 
     public  List<OdsProcureOrder> selectOdsProcureOrderListT(OdsProcureOrder odsProcureOrder);
 
-    public  OdsProcureOrder selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
+    public   List<OdsProcureOrder> selectOdsProcureOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }

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

@@ -4,9 +4,10 @@ import java.util.List;
 
 import com.op.wms.domain.WmsRawOrderIn;
 import com.op.wms.domain.WmsToWCSDTO;
+import org.apache.ibatis.annotations.Param;
 
 /**
- * 包材到货单Mapper接口
+ * 包材到货单Mapper接口s
  *
  * @author Open Platform
  * @date 2023-08-30
@@ -66,11 +67,11 @@ public interface WmsRawOrderInMapper {
 
     List<String> finishedProductRequestInboundsn(WmsToWCSDTO wcsdto);
 
-    WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdTWO(String rawOrderInId);
+    WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdTWO(@Param("ID")String rawOrderInId);
 
     String selectQcCheckTask(WmsRawOrderIn wmsRawOrderIn1);
 
-    WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(String id);
+    WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(@Param("rawOrderInId")String id);
 
     List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn);
 }

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

@@ -161,5 +161,5 @@ public interface IOdsProcureOrderService {
 
     List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder);
 
-    OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
+    List<OdsProcureOrder>  selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder);
 }

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

@@ -1791,11 +1791,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     }
 
     @Override
-    public OdsProcureOrder selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
+    public  List<OdsProcureOrder>  selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
         //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
-        OdsProcureOrder order=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
+        List<OdsProcureOrder> orderList=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
-        return order;
+        return orderList;
     }
 
 
@@ -2096,7 +2096,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount());
                     wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews);
                 }
-                wmsRawOrderIn.setOrderStatus("0");
+                wmsRawOrderIn.setOrderStatus("1");
                 wmsRawOrderIn.setAccountingTime(new Date());
                 wmsRawOrderIn.setAccountingMessage(result2.getMsg());
                 wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT);
@@ -3336,7 +3336,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount());
                     wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmountFC(wmsOdsMateStorageNews);
                 }
-                wmsRawOrderIn.setOrderStatus("1");
+                wmsRawOrderIn.setOrderStatus("0");
                 wmsRawOrderIn.setAccountingTime(new Date());
                 wmsRawOrderIn.setUserDefined10(result2.getMsg());
 //                wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT);