设备后台sql修改

op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java

@@ -1,6 +1,8 @@
 package com.op.device.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.device.domain.EquEquipment;
@@ -48,6 +50,8 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出故障报修列表
      */
@@ -152,4 +156,20 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 黑蚊香车间生产监控看板设备故障信息
+     */
+
+
+    @GetMapping("/getCsRepairlist")
+    public List<EquRepairOrder> getCsRepairlist(EquRepairOrder equRepairOrder) {
+        equRepairOrder.setOrderStatus("2");
+        List<EquRepairOrder> equRepairOrderList=equRepairOrderService.selectEquRepairOrderList(equRepairOrder);
+        for (int i = 0; i < equRepairOrderList.size(); i++) {
+            Map map=new HashMap();
+            map=equRepairOrderService.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
+            equRepairOrderList.get(i).setParams(map);
+        }
+        return equRepairOrderList;
+    }
 }

op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java

@@ -27,19 +27,5 @@ public class MyWebSocketHandler extends TextWebSocketHandler {
     private EquRepairOrderMapper equRepairOrderMapper;
 
 
-    @Scheduled(fixedRate = 5000) // 每60秒执行一次
-    @DS("ds_1000")
-    public void sendPeriodicMessages() {
-        EquRepairOrder equRepairOrder=new EquRepairOrder();
-        equRepairOrder.setOrderStatus("2");
-        List<EquRepairOrder> equRepairOrderList=equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder);
-        for (int i = 0; i < equRepairOrderList.size(); i++) {
-            Map map=new HashMap();
-            map=equRepairOrderMapper.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
-            equRepairOrderList.get(i).setParams(map);
-        }
-        String jsonResult = JSON.toJSONString(equRepairOrderList);
-        WebSocketUsers.sendMessageToUsersByText(jsonResult);
 
-    }
 }

op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java

@@ -1,6 +1,7 @@
 package com.op.device.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
@@ -80,4 +81,5 @@ public interface IEquRepairOrderService {
 
     //查询组线
     public List<EquEquipment> selectGroupLineList();
+    Map selectEquInfoByequCode(String equipmentCode);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -604,4 +605,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
         return equEquipmentMapper.selectEquipmentGroupLine();
     }
 
+    @Override
+    @DS("#header.poolName")
+    public Map selectEquInfoByequCode(String equipmentCode) {
+        return equRepairOrderMapper.selectEquInfoByequCode(equipmentCode);
+    }
+
 }

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -15,8 +15,9 @@
         from equ_repair_work_order wo
         left join base_equipment be on wo.equipment_code = be.equipment_code
         left join equ_team et on wo.work_team = et.team_code
-        where wo.work_status = '0'
-		and wo.del_flag = '0'
+        where
+--         wo.work_status = '0' AND
+		wo.del_flag = '0'
     </select>
 
     <select id="selectEquipmentList" parameterType="EquOperation" resultType="com.op.device.domain.vo.IEquipmentVO">

op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java

@@ -148,7 +148,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
             List<RecordDnbInstant> dnbInstantList = recordDnbInstantMapper.instantList(instant);
             return dnbInstantList;
         }
-        return null;
+        return new ArrayList<>();
     }
 
     /**

op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/EnergyPreviewServiceImpl.java

@@ -927,6 +927,10 @@ public class EnergyPreviewServiceImpl implements IEnergyPreviewService {
             result.put("lineDnbList", new ArrayList<>());
         }
         result.put("pieMap", pieMap);
+        for (HashMap<String, String> hashMap : tableList) {
+            BigDecimal decimal = new BigDecimal(hashMap.get("expend")).multiply(new BigDecimal(100));//占比
+            hashMap.put("rate", decimal.divide(totalExpend, 2 ,RoundingMode.HALF_UP).toPlainString() + "%");
+        }
         HashMap<String, String> tableMap = new HashMap<>();
         tableMap.put("businessName", "总用电量");
         tableMap.put("expend", totalExpend.toPlainString());

op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml

@@ -92,13 +92,13 @@
                 (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime}
             </if>
             <if test="params.startTime != null and params.startTime != '' and params.endTime != null and params.endTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.startTime} and #{params.endTime}
             </if>
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime}
             </if>
             <if test="endTime != null ">and end_time = #{endTime}</if>
             <if test="recordTime != null ">and record_time = #{recordTime}</if>
@@ -125,7 +125,7 @@
     <select id="energyConsumptionReportByTime" resultType="java.util.Map">
         select ert.pointTime, sum(isnull(ert.expend,0)) expend
         from (
-        select left(CONVERT(VARCHAR(17), rpd.begin_time, 120), #{timeSub}) pointTime, rpd.expend
+        select left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{timeSub}) pointTime, rpd.expend
         from report_point_dnb rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         <where>
@@ -142,7 +142,7 @@
                 and rpd.begin_time between #{startTime} and #{endTime}
             </if>
             <if test="startDay != null and startDay != '' and endDay != null and endDay != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
             </if>
         </where>
         ) ert
@@ -153,7 +153,7 @@
     <select id="energyConsumptionAnalysisDetails" resultType="java.util.Map">
         select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(isnull(ert.expend,0)) expend
         from (
-        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend
+        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) pointTime, rpd.expend
         from report_point_dnb rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         <where>
@@ -171,7 +171,7 @@
             <!--                and rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime}-->
             <!--            </if>-->
             <if test="startDay != null and startDay != '' and endDay != null and endDay != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
             </if>
         </where>
         ) ert
@@ -196,7 +196,7 @@
         max(ert.meter_value) meter_value,
         max(ert.monitor_addr) address
         from (
-        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), #{params.timeSub}) pointTime, rpd.expend,
+        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{params.timeSub}) pointTime, rpd.expend,
         rpd.meter_value,m.monitor_addr
         from report_point_dnb rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
@@ -246,7 +246,7 @@
         left join base_public_user bpu on bmp.public_share_id = bpu.id
         <where>
             <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120),10) between #{beginCollectTime} and #{endCollectTime}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120),10) between #{beginCollectTime} and #{endCollectTime}
             </if>
             <if test="monitorIdList != null  and monitorIdList.size > 0">
                 and rpd.monitor_id IN
@@ -460,7 +460,7 @@
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         WHERE 1=1
         <if test="params.startTime != null and params.startTime != '' and params.endTime != null and params.endTime != ''">
-            and CONVERT(VARCHAR(17), rpd.begin_time, 120) between #{params.startTime} and #{params.endTime}
+            and CONVERT(VARCHAR(19), rpd.begin_time, 120) between #{params.startTime} and #{params.endTime}
         </if>
         <if test="params.monitorIdList != null  and params.monitorIdList.size > 0">
             and rpd.monitor_id IN
@@ -475,13 +475,13 @@
     <select id="datePointDnbGroupList" parameterType="ReportPointDnb" resultType="java.util.Map">
         select ert.pointTime begin_time,
         sum(isnull(ert.expend, 0)) expend
-        from (select left(CONVERT(VARCHAR(17), rpd.begin_time, 120), #{params.timeSub}) pointTime,
+        from (select left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{params.timeSub}) pointTime,
         rpd.expend
         from report_point_dnb rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         where 1=1
         <if test="params.startTime != null and params.startTime != '' and params.endTime != null and params.endTime != ''">
-            and CONVERT(VARCHAR(17), rpd.begin_time, 120) between #{params.startTime} and #{params.endTime}
+            and CONVERT(VARCHAR(19), rpd.begin_time, 120) between #{params.startTime} and #{params.endTime}
         </if>
         <if test="params.monitorIdList != null  and params.monitorIdList.size > 0">
             and rpd.monitor_id IN

op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml

@@ -78,13 +78,13 @@
                 (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime}
             </if>
             <if test="params.startTime != null and params.startTime != '' and params.endTime != null and params.endTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.startTime} and #{params.endTime}
             </if>
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
-                and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime}
+                and CONVERT(VARCHAR(19), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime}
             </if>
             <if test="beginTime != null ">and begin_time = #{beginTime}</if>
             <if test="endTime != null ">and end_time = #{endTime}</if>
@@ -118,7 +118,7 @@
     <select id="energyConsumptionReportByTime" resultType="java.util.Map">
         select ert.pointTime, sum(isnull(ert.expend,0)) expend
         from (
-        select left(left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10), #{timeSub}) pointTime, rpd.expend
+        select left(left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10), #{timeSub}) pointTime, rpd.expend
         from report_point_water rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         <where>
@@ -134,7 +134,7 @@
                 and rpd.begin_time between #{startTime} and #{endTime}
             </if>
             <if test="startDay != null and startDay != '' and endDay != null and endDay != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
             </if>
         </where>
         ) ert
@@ -144,7 +144,7 @@
     <select id="energyConsumptionAnalysisDetails" resultType="java.util.Map">
         select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(if(ert.expend is null, 0, ert.expend)) expend
         from (
-        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend
+        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) pointTime, rpd.expend
         from report_point_water rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
         <where>
@@ -158,7 +158,7 @@
                 and rpd.begin_time between #{startTime} and #{endTime}
             </if>
             <if test="startDay != null and startDay != '' and endDay != null and endDay != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) between #{startDay} and #{endDay}
             </if>
         </where>
         ) ert
@@ -182,7 +182,7 @@
         max(ert.meter_value) meter_value,
         max(ert.monitor_addr) address
         from (
-        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), #{params.timeSub}) pointTime, rpd.expend,
+        select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{params.timeSub}) pointTime, rpd.expend,
         rpd.meter_value,m.monitor_addr
         from report_point_water rpd
         left join base_monitor_info m on m.monitor_id = rpd.monitor_id
@@ -231,7 +231,7 @@
         left join base_public_user bpu on bmp.public_share_id = bpu.id
         <where>
             <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
-                and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{beginCollectTime} and #{endCollectTime}
+                and left(CONVERT(VARCHAR(19), rpd.begin_time, 120), 10) between #{beginCollectTime} and #{endCollectTime}
             </if>
             <if test="monitorIdList != null  and monitorIdList.size > 0">
                 and rpd.monitor_id IN

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-open/src/main/java/com/op/open/mapper/OpenMapper.java

@@ -97,6 +97,8 @@ public interface OpenMapper {
     int updateProductNoBatchs(@Param("list") List<BaseProductDTO> updates);
 
     int addProductNoBatchs(@Param("list")List<BaseProductDTO> everyList);
+
+    String getProductGroup(String materialCode);
 //
 //    int updateEquBatchs(@Param("list") List<EquEquipmentDTO> updates);
 //

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -451,7 +451,13 @@ public class OpenServiceImpl implements OpenService {
         QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
         if (group == null) {
             group = new QcMaterialGroupDetailDTO();
-            group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组
+
+            String initGroup  = openMapper.getProductGroup(qcCheckTaskProduce.getMaterialCode());
+            if(initGroup != null){//包材共性
+                group.setGroupId(initGroup);
+            }else {//成品蚊香物料组
+                group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");
+            }
         }
         qctp.setGroupId(group.getGroupId());//共性
         List<QcCheckTaskDetailDTO> itemsGG = openMapper.getTPByTypeGroup(qctp);

op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml

@@ -463,5 +463,13 @@
             #{code}
         </foreach>
     </select>
+    <select id="getProductGroup" resultType="java.lang.String">
+        select top 1 qmg.id groupId
+        from base_product bp
+                 left join qc_material_group qmg on qmg.group_code = bp.mvgr5
+        where bp.product_code like concat('%',#{materialCode},'%')
+          and bp.del_flag = '0' and qmg.del_flag = '0'
+        order by qmg.create_time desc
+    </select>
 
 </mapper>

op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java

@@ -81,6 +81,7 @@ public class QcStaticTable extends BaseEntity {
     private String recordId;
     private String detailId;
     private String checkNo;
+    private String groupId;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date incomeTime;
@@ -125,6 +126,14 @@ public class QcStaticTable extends BaseEntity {
     private String sampleQty;
     private String noOkQty;
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getOkNumRate() {
         return okNumRate;
     }

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java

@@ -157,4 +157,6 @@ public interface QcStaticTableMapper {
     @MapKey("ymdms")
     Map<String, QcStaticTable> getCpSampMap(QcStaticTable qcStaticTable);
     List<String> getCpDefectTypes(QcStaticTable qcStaticTable);
+
+    String getGroupIdByOrderNo(String orderNo);
 }

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

@@ -311,6 +311,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     @Override
     @DS("#header.poolName")
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
+
+        String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
+        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+            groupId = "3dc0655fea3449c59c76a01cc5b91565";
+        }
+        qcStaticTable.setGroupId(groupId);
         List<QcStaticTable> projects = qcStaticTableMapper.getXJProjects(qcStaticTable);
         Map<String, QcStaticTable> detailMap = null;
         if(qcStaticTable.getShiftId().equals("5")){

op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml

@@ -222,7 +222,7 @@
 				qctp.project_no projectNo
 		from qc_check_type_project qctp
 		left join qc_check_project qct on qctp.project_id = qct.id
-		where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0'
+		where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0' and qctp.group_id = #{groupId}
 		order by qctp.sort
 	</select>
     <select id="getProjectDetail" resultType="com.op.quality.domain.QcStaticTable">
@@ -1399,5 +1399,11 @@
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>
+    <select id="getGroupIdByOrderNo" resultType="java.lang.String">
+        select bp.mvgr5
+        from pro_order_workorder pow
+                 left join base_product bp on bp.product_code = pow.product_code
+        where pow.workorder_code = #{orderNo}
+    </select>
 
 </mapper>

op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java

@@ -1,117 +0,0 @@
-package com.op.sap.domain.vo;
-
-/**
- * 反冲类型的领料过账接口
- * auth YangWL
- *
- * MATNR	CHAR	18	0	物料号 	必填
- * PLANT	CHAR	4	0	工厂	必填
- * GR_RCPT	CHAR	12	0	收货方/运达方 	选填
- * LGORT	CHAR	4	0	库存地点	必填
- * UMLGO	CHAR	4	0	收货/发货库存地点	选填
- * QUANTITY	QUAN	13	3	数量	必填
- * MEINS	UNIT	3	0	条目单位	必填
- * BATCH	CHAR	10	0	批号	必填
- * MOVE_BATCH	CHAR	10	0	收货/发货批量	选填
- */
-
-
-public class SapBackflushMPQuery {
-
-    private String matnr;
-    private String plant;
-    private String gr_rcpt;
-    private String lgort;
-    private String umlgo;
-    private String quantity;
-    private String meins;
-    private String batch;
-    private String move_batch;
-
-    public String getMatnr() {
-        return matnr;
-    }
-
-    public void setMatnr(String matnr) {
-        this.matnr = matnr;
-    }
-
-    public String getPlant() {
-        return plant;
-    }
-
-    public void setPlant(String plant) {
-        this.plant = plant;
-    }
-
-    public String getGr_rcpt() {
-        return gr_rcpt;
-    }
-
-    public void setGr_rcpt(String gr_rcpt) {
-        this.gr_rcpt = gr_rcpt;
-    }
-
-    public String getLgort() {
-        return lgort;
-    }
-
-    public void setLgort(String lgort) {
-        this.lgort = lgort;
-    }
-
-    public String getUmlgo() {
-        return umlgo;
-    }
-
-    public void setUmlgo(String umlgo) {
-        this.umlgo = umlgo;
-    }
-
-    public String getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(String quantity) {
-        this.quantity = quantity;
-    }
-
-    public String getMeins() {
-        return meins;
-    }
-
-    public void setMeins(String meins) {
-        this.meins = meins;
-    }
-
-    public String getBatch() {
-        return batch;
-    }
-
-    public void setBatch(String batch) {
-        this.batch = batch;
-    }
-
-    public String getMove_batch() {
-        return move_batch;
-    }
-
-    public void setMove_batch(String move_batch) {
-        this.move_batch = move_batch;
-    }
-
-    @Override
-    public String toString() {
-        return "SapBackflushMPQuery{" +
-                "matnr='" + matnr + '\'' +
-                ", plant='" + plant + '\'' +
-                ", gr_rcpt='" + gr_rcpt + '\'' +
-                ", lgort='" + lgort + '\'' +
-                ", umlgo='" + umlgo + '\'' +
-                ", quantity='" + quantity + '\'' +
-                ", meins='" + meins + '\'' +
-                ", batch='" + batch + '\'' +
-                ", move_batch='" + move_batch + '\'' +
-                '}';
-    }
-}

op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java

@@ -1,127 +0,0 @@
-package com.op.sap.domain.vo;
-
-//智慧工厂-订单物料领料过账、原材料补料、订单物料退料过账（MB1A）
-
-/**
- AUFNR	CHAR	12	0	订单号 	必填
- BWART	CHAR	3	0	移动类型（库存管理）	必填
- PLANT	CHAR	4	0	工厂	必填
- GL_ACCOUNT	CHAR	10	0	总帐科目编号	选填
- COSTCENTER	CHAR	10	0	成本中心	选填
- GR_RCPT	CHAR	12	0	收货方/运达方 	选填
- LGORT	CHAR	4	0	库存地点	必填
- MATNR	CHAR	18	0	物料号 	必填
- QUANTITY	QUAN	13	3	数量	必填
- MEINS	UNIT	3	0	基本计量单位	必填
- BATCH	CHAR	10	0	批号	选填
-
- */
-public class SapMaterialPosting {
-
-
-
-    /**
-     * 订单物料领料过账、原材料补料的移动类型值为261
-     * 订单物料退料过账为262
-     *
-     */
-    private String  aufnr;
-    private String  bwart;
-    private String  plant;
-    private String  gl_account;
-    private String  costcenter;
-    private String  gr_rcpt;
-    private String  lgort;
-    private String  matnr;
-    private String  quantity;
-    private String  meins;
-    private String  batch;
-
-    public String getGl_account() {
-        return gl_account;
-    }
-
-    public void setGl_account(String gl_account) {
-        this.gl_account = gl_account;
-    }
-
-    public String getCostcenter() {
-        return costcenter;
-    }
-
-    public void setCostcenter(String costcenter) {
-        this.costcenter = costcenter;
-    }
-
-    public String getGr_rcpt() {
-        return gr_rcpt;
-    }
-
-    public void setGr_rcpt(String gr_rcpt) {
-        this.gr_rcpt = gr_rcpt;
-    }
-
-    public String getAufnr() {
-        return aufnr;
-    }
-
-    public void setAufnr(String aufnr) {
-        this.aufnr = aufnr;
-    }
-
-    public String getBwart() {
-        return bwart;
-    }
-
-    public void setBwart(String bwart) {
-        this.bwart = bwart;
-    }
-
-    public String getPlant() {
-        return plant;
-    }
-
-    public void setPlant(String plant) {
-        this.plant = plant;
-    }
-
-    public String getLgort() {
-        return lgort;
-    }
-
-    public void setLgort(String lgort) {
-        this.lgort = lgort;
-    }
-
-    public String getMatnr() {
-        return matnr;
-    }
-
-    public void setMatnr(String matnr) {
-        this.matnr = matnr;
-    }
-
-    public String getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(String quantity) {
-        this.quantity = quantity;
-    }
-
-    public String getMeins() {
-        return meins;
-    }
-
-    public void setMeins(String meins) {
-        this.meins = meins;
-    }
-
-    public String getBatch() {
-        return batch;
-    }
-
-    public void setBatch(String batch) {
-        this.batch = batch;
-    }
-}

op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapPurchaseOrderQuery.java

@@ -1,162 +0,0 @@
-package com.op.sap.domain.vo;
-
-
-public class SapPurchaseOrderQuery {
-        /**
-         * S_EBELN	采购订单号
-         * S_EBELP	行项目
-         * S_MATNR	物料号
-         * S_PWERK  工厂
-         */
-    /**
-     * EBELN		采购凭证号
-     * EBELP		采购凭证的项目编号
-     * MATNR		物料号
-     * MAKTX		物料描述（短文本）
-     * MENGE		采购订单数量
-     * MEINS		采购订单的计量单位
-     * ZMENGE		交货数量
-     * ZMEINS		基本计量单位
-     * LIFNR		供应商帐户号
-     * WERKS		工厂
-     * LGORT		库存地点
-     * EINDT		项目交货日期
-     * ELIKZ		交货已完成标识
-     * BEIZHU		注释
-     */
-    private String ebeln;
-    private String ebelp;
-    private String matnr;
-    private String pwerk;
-    private String maktx;
-    private String menge;
-    private String meins;
-    private String zmenge;
-    private String zmeins;
-    private String lifnr;
-    private String werks;
-    private String lgort;
-    private String eindt;
-    private String elikz;
-    private String beizhu;
-
-    public String getMaktx() {
-        return maktx;
-    }
-
-    public void setMaktx(String maktx) {
-        this.maktx = maktx;
-    }
-
-    public String getMenge() {
-        return menge;
-    }
-
-    public void setMenge(String menge) {
-        this.menge = menge;
-    }
-
-    public String getMeins() {
-        return meins;
-    }
-
-    public void setMeins(String meins) {
-        this.meins = meins;
-    }
-
-    public String getZmenge() {
-        return zmenge;
-    }
-
-    public void setZmenge(String zmenge) {
-        this.zmenge = zmenge;
-    }
-
-    public String getZmeins() {
-        return zmeins;
-    }
-
-    public void setZmeins(String zmeins) {
-        this.zmeins = zmeins;
-    }
-
-    public String getLifnr() {
-        return lifnr;
-    }
-
-    public void setLifnr(String lifnr) {
-        this.lifnr = lifnr;
-    }
-
-    public String getWerks() {
-        return werks;
-    }
-
-    public void setWerks(String werks) {
-        this.werks = werks;
-    }
-
-    public String getLgort() {
-        return lgort;
-    }
-
-    public void setLgort(String lgort) {
-        this.lgort = lgort;
-    }
-
-    public String getEindt() {
-        return eindt;
-    }
-
-    public void setEindt(String eindt) {
-        this.eindt = eindt;
-    }
-
-    public String getElikz() {
-        return elikz;
-    }
-
-    public void setElikz(String elikz) {
-        this.elikz = elikz;
-    }
-
-    public String getBeizhu() {
-        return beizhu;
-    }
-
-    public void setBeizhu(String beizhu) {
-        this.beizhu = beizhu;
-    }
-
-    public String getEbeln() {
-        return ebeln;
-    }
-
-    public void setEbeln(String ebeln) {
-        this.ebeln = ebeln;
-    }
-
-    public String getEbelp() {
-        return ebelp;
-    }
-
-    public void setEbelp(String ebelp) {
-        this.ebelp = ebelp;
-    }
-
-    public String getMatnr() {
-        return matnr;
-    }
-
-    public void setMatnr(String matnr) {
-        this.matnr = matnr;
-    }
-
-    public String getPwerk() {
-        return pwerk;
-    }
-
-    public void setPwerk(String pwerk) {
-        this.pwerk = pwerk;
-    }
-}

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);
-        return success(odsProcureOrder1);
+        List<OdsProcureOrder>  orderList = odsProcureOrderService.selectOrderCardTLTWO(odsProcureOrder);
+        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);
-        return order;
+        List<OdsProcureOrder> orderList=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
+        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);