生产订单查询

src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java

@@ -1560,12 +1560,12 @@ public class BaseServiceImpl implements BaseService {
             responseData.setCode("500");
             return responseData;
         }
-        String partTypeDb = partR1.get(0).getPartTypeDb();
-        if ((!"F".equals(partTypeDb)) && (!"W".equals(partTypeDb)) && (!"T".equals(partTypeDb))) {
-            responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200062));
-            responseData.setCode("500");
-            return responseData;
-        }
+        // String partTypeDb = partR1.get(0).getPartTypeDb();
+        // if ((!"F".equals(partTypeDb)) && (!"W".equals(partTypeDb)) && (!"T".equals(partTypeDb))) {
+        //     responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200062));
+        //     responseData.setCode("500");
+        //     return responseData;
+        // }
         //如果新老物料号不同，那么需要判断新的物料是否是虚拟件
         if ((!inData.getPartNo().equals(inData.getPartNo1())) && "Y".equals(inData.getRepairFlag1()) && "V".equals(partR1.get(0).getmRPCode())) {
             responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200063));

src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java

@@ -46,7 +46,7 @@ public class SysMenuController extends AbstractController {
     }
 
     /**
-     * 所有菜单列表
+     * 所有菜单列表R
      */
     @GetMapping("/list")
     @RequiresPermissions("sys:menu:list")

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -110,8 +110,7 @@
         Left Join SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo
         Left Join SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo
         <where>
-            Round(T.QtyScheduled,3) <![CDATA[ < ]]> round(T.QtyRequired,3) and T.ClosedFlag = 'N' AND T.WorkCenterNo
-            <![CDATA[<>]]> 'FQC'
+            Round(T.QtyScheduled,3) <![CDATA[ < ]]> round(T.QtyRequired,3) and T.ClosedFlag = 'N'
             <if test="username != null and username != ''">
                 and T.site in (Select Site from AccessSite where upper(UserID)=#{username})
             </if>

src/main/resources/mapper/schedule/SchedulingMapper.xml

@@ -419,10 +419,11 @@
         SELECT sfr.RollNo rollNo, CONVERT(VARCHAR(19), sfr.CreatedDate, 120) createdDate, dbo.Get_OperatorDesc(sfr.Site, sfr.Createdby) createdBy,
         sfr.CreatedOpsItemNo itemNo, dbo.Get_SOOpsDescription(sfr.Site, sfr.OrderNo, sfr.CreatedOpsItemNo) itemDesc,
         dbo.Get_SORouting_NextOperationDesc(sfr.Site,sfr.OrderNo,sfr.CreatedOpsItemNo) nextItemDesc, sfr.RollQty rollQty, so.PartNo partNo,
-        dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc, pt.Remark customerPartNo, pt.ConfigurationTemplateID customerName, oi.U_UL ul,
+        dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc, pt.Remark customerPartNo, pt.ConfigurationTemplateID customerName,'系统数据' ul,
+<!--        oi.U_UL ul,-->
         pt.DefaultLocationID locationId, st.SiteName siteName
         FROM SFDC_Rolls sfr, ShopOrder so, Part pt
-        LEFT JOIN dbo.view_sap_oitm oi ON oi.ItemCode = pt.PartNo
+<!--        LEFT JOIN dbo.view_sap_oitm oi ON oi.ItemCode = pt.PartNo-->
         LEFT JOIN Site st ON st.SiteID = pt.Site
         <where>
             AND sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo