派工单

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -494,4 +494,19 @@ public class FbsMomOrderdetail implements Serializable {
 	//工作中心
 	@TableField(exist = false)
 	private String workCenter;
+
+	//工艺顺序
+	@TableField(exist = false)
+	private String processSequence;
+
+	//工艺id
+	@TableField(exist = false)
+	private String fbsTechnologicalProcessId;
+//	@TableField(exist = false)
+//	private String sortseq;
+	@TableField(exist = false)
+	private String SAPStatus;
+	//工艺名称
+	@TableField(exist = false)
+	private String fbsTechnologicalProcessName;
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -62,6 +62,8 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthListStatre(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
 
+    List<FbsMomOrderdetail>getMonthListStatreWork(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
+
     /**
     * @Author chenchuang
     * @Description //TODO 已关闭当月数据

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -83,6 +83,61 @@
          m.createtime DESC
  </select>
 
+    <select id="getMonthListStatreWork" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        mo.cost_item_code as itemCode,
+        ftp.memo as workCenter,
+        m.MoId,
+        m.MoCode,
+        i.cInvCode,
+        i.cInvStd,
+        i.cInvName,
+        i.cInvDefine13,
+        mo.Qty,
+        mo.QualifiedInQty,
+        m.Define12,
+        m.cost_item_code as costItemCode,
+        mm.StartDate,
+        mm.DueDate,
+        mo.SortSeq as sortSeq,
+        mo.SAPStatus as SAPStatus,
+        ftp.id as fbsTechnologicalProcessId,
+        ftp.name as fbsTechnologicalProcessName,
+        (select group_concat(name ORDER BY sort separator '-->') from fbs_technological_process_item where ftp.id=fbs_technological_process_id) as processSequence
+        FROM
+        mom_orderdetail mo
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        left join mom_morder mm on mo.MoDId=mm.MoDId
+        left join fbs_technological_process ftp on mo.InvCode=ftp.name
+        WHERE
+
+        <!--datediff(
+        MONTH,
+        mm.StartDate,
+        getdate()) =0-->
+        mo.Status = 3
+        <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
+            AND m.MoCode=#{fbsMomOrderdetail.mocode}
+        </if>
+        <if test="fbsMomOrderdetail.itemCode!=null and fbsMomOrderdetail.itemCode!=''">
+            AND mo.cost_item_code=#{fbsMomOrderdetail.itemCode}
+        </if>
+        <if test="fbsMomOrderdetail.costitemname!=null and fbsMomOrderdetail.costitemname!=''">
+            AND mo.CostItemName LIKE "%" #{fbsMomOrderdetail.costitemname} "%"
+        </if>
+        <if test="fbsMomOrderdetail.workCenter!=null and fbsMomOrderdetail.workCenter!=''">
+            AND ftp.memo LIKE  "%" #{fbsMomOrderdetail.workCenter} "%"
+        </if>
+        <if test="fbsMomOrderdetail.cinvcode!=null and fbsMomOrderdetail.cinvcode!=''">
+            AND i.cInvCode=#{fbsMomOrderdetail.cinvcode}
+        </if>
+        <if test="fbsMomOrderdetail.cinvname!=null and fbsMomOrderdetail.cinvname!=''">
+            AND i.cInvName=#{fbsMomOrderdetail.cinvname}
+        </if>
+        ORDER BY
+        m.createtime DESC
+    </select>
 
  <select id="getMonthListStatre" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
      SELECT

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -186,4 +186,7 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
 
     Integer getMoallocateListGroupCount();
 
+
+    List<FbsMomOrderdetail> getMonthListStatreWork(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -431,5 +431,10 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getMoallocateListGroupCount();
     }
 
+    @Override
+    public List<FbsMomOrderdetail> getMonthListStatreWork(FbsMomOrderdetail fbsMomOrderdetail) {
+        return fbsMomOrderdetailMapper.getMonthListStatreWork(fbsMomOrderdetail);
+    }
+
 
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -476,7 +476,7 @@ public class FbsWorkshopDispatchListController {
 	  * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>>
 	  */
 	 @GetMapping(value = "/getFbsMomOrder")
-	 public Result<List<FbsMomOrderdetail>> getFbsMomOrder(){
+	 public Result<List<FbsMomOrderdetail>> getFbsMomOrder(FbsMomOrderdetail fbsMomOrderdetail){
 		 Result<List<FbsMomOrderdetail>> result =new Result<>();
 		 try {
 //		 	 QueryWrapper<FbsMomOrder> fbsMomOrderQueryWrapper=new QueryWrapper<>();
@@ -484,8 +484,10 @@ public class FbsWorkshopDispatchListController {
 //		 	 fbsMomOrderQueryWrapper.lambda().orderByDesc(FbsMomOrder::getCreatetime);
 //			 List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list(fbsMomOrderQueryWrapper);
 //			 result.setResult(fbsMomOrderList);
-			 FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
-			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
+//			 FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
+//			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatreWork(fbsMomOrderdetail);
+//			 getMonthListStatreWork
 			 //剩余数量为0的remove
 			 getFbsMomOrderdetailList(fbsMomOrderdetailList);
 			 result.setResult(fbsMomOrderdetailList);

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -305,6 +305,9 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private String lackOfMaterialState;
 
 	//工作中心
-	@TableField(exist = false)
+//	@TableField(exist = false)
 	private String workCenter;
+
+	//工艺顺序
+	private String processSequence;
 }