20211213

src/main/java/com/gaotao/modules/base/dao/BaseMapper.java

@@ -635,6 +635,7 @@ public interface BaseMapper {
      */
     void deleteProductionLineData(ProductionLineData inData);
 
+    List<PartData> checkConfigurationTemplateID(PartData inData);
     //----------加工中心--------------------------
 
     /**

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.servlet.http.Part;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -647,6 +648,22 @@ public class BaseServiceImpl implements BaseService {
     @Override
     public ResponseData savePartFamily(PartFamilyData inData){
         ResponseData responseData = new ResponseData();
+            String s1=inData.getFamilyID();
+            if(s1.equals("")||s1==null){
+
+            }else {
+                StringBuilder sb1=new StringBuilder();
+                int len1= s1.length();
+                char c1;
+                for (int i = 0; i <len1 ; i++) {
+                    c1=s1.charAt(i);
+                    if(c1>='a'&&c1<='z'){
+                        c1=(char)(c1-32);
+                    }
+                    sb1.append(c1);
+                }
+                inData.setFamilyID(sb1.toString());
+            }
         if (inData.getAdd()==0){
             List<SiteData> list3=baseMapper.checkSiteId(inData.getSite());
             if(list3.size()==0){
@@ -837,6 +854,40 @@ public class BaseServiceImpl implements BaseService {
                 responseData.setCode("500");
                 return responseData;
             }
+            PartData part1=new PartData();
+            part1.setPartNo(inData.getPartNo());
+            part1.setSite(inData.getSite());
+            List<PartData> partR1 =getPartNoDetail(part1);
+            if (partR1.size()==0){
+                responseData.setMsg("该物料编码不存在或者不可用！");
+                responseData.setCode("500");
+                return responseData;
+            }
+            PartData part2=new PartData();
+            part2.setPartNo(inData.getfGPartNo());
+            part2.setSite(inData.getSite());
+            List<PartData> partR2 =getPartNoDetail(part2);
+            if (partR2.size()==0){
+                responseData.setMsg("该产品编码不存在或者不可用！");
+                responseData.setCode("500");
+                return responseData;
+            }
+            SupplierData supplierData=new SupplierData();
+            supplierData.setSite(inData.getSite());
+            supplierData.setSupplierID(inData.getSupplierID());
+            List<SupplierData> checkSu=getSupplierDetail(supplierData);
+            if (checkSu.size()==0){
+                responseData.setMsg("该供应商编码不存在或者不可用！");
+                responseData.setCode("500");
+                return responseData;
+            }
+            part2.setConfigurationTemplateID(inData.getCustomerID());
+            List<PartData> partR3 =checkConfigurationTemplateID(part2);
+            if (partR3.size()==0){
+                responseData.setMsg("该客户编号不存在或者不可用！");
+                responseData.setCode("500");
+                return responseData;
+            }
             //新增
             baseMapper.saveReferencePartInfoData(inData);
         }else{
@@ -846,6 +897,15 @@ public class BaseServiceImpl implements BaseService {
                 responseData.setCode("500");
                 return responseData;
             }
+            SupplierData supplierData=new SupplierData();
+            supplierData.setSite(inData.getSite());
+            supplierData.setSupplierID(inData.getSupplierID());
+            List<SupplierData> checkSu=getSupplierDetail(supplierData);
+            if (checkSu.size()==0){
+                responseData.setMsg("该供应商编码不存在或者不可用！");
+                responseData.setCode("500");
+                return responseData;
+            }
             baseMapper.editReferencePartInfoData(inData);
         }
         responseData.setCode("200");
@@ -930,6 +990,11 @@ public class BaseServiceImpl implements BaseService {
         return responseData;
     }
 
+    public List<PartData> checkConfigurationTemplateID(PartData inData){
+        List<PartData> result=baseMapper.checkConfigurationTemplateID(inData);
+        return result;
+    }
+
     //----------加工中心--------------------------
 
     @Override

src/main/java/com/gaotao/modules/purchasingManagement/entity/ViewSapPoData.java

@@ -40,6 +40,12 @@ public class ViewSapPoData {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planReceiptDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date1;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date2;
 
     /**
      *
@@ -209,5 +215,21 @@ public class ViewSapPoData {
     public void setsOPartNo(String sOPartNo) {
         this.sOPartNo = sOPartNo;
     }
+
+    public Date getDate1() {
+        return date1;
+    }
+
+    public void setDate1(Date date1) {
+        this.date1 = date1;
+    }
+
+    public Date getDate2() {
+        return date2;
+    }
+
+    public void setDate2(Date date2) {
+        this.date2 = date2;
+    }
 }
 

src/main/resources/mapper/base/BaseMapper.xml

@@ -426,15 +426,15 @@
     </select>
 
     <select id="getPartNoDetail" resultType="com.gaotao.modules.base.entity.PartData" >
-        select  partDescription,umid from  Part Where Site=#{site} and PartNo=#{partNo}
+        select  partDescription,umid,spec from  Part Where Site=#{site} and PartNo=#{partNo} and Active='Y'
     </select>
 
      <select id="getSupplierDetail" resultType="com.gaotao.modules.base.entity.SupplierData" >
-        select  SupplierID,SupplierName from  Supplier Where Site=#{site} and SupplierID=#{supplierID}
+        select  SupplierID,SupplierName from  Supplier Where Site=#{site} and SupplierID=#{supplierID} and  Active='Y'
     </select>
 
      <select id="checkReferencePartInfo" resultType="com.gaotao.modules.base.entity.DowntimeReasonData">
-         select   Site,PartNo  from DowntimeReason  where CustomerID=#{customerID} and Site=#{site} and FGPartNo=#{fGPartNo} and PartNo=#{partNo}
+         select   Site,PartNo  from ReferencePartInfo  where CustomerID=#{customerID} and Site=#{site} and FGPartNo=#{fGPartNo} and PartNo=#{partNo}
     </select>
     <insert id="saveReferencePartInfoData" parameterType="com.gaotao.modules.base.entity.DowntimeReasonData">
         INSERT INTO  ReferencePartInfo (Site,CustomerID,PartNo,ReferencePartDesc,SupplierID,FGPartNo,LastUpdateBy)
@@ -477,7 +477,15 @@
      Select T.* ,P.ProLineDesc as ProductionLineDesc
      from WorkCenter as T
      LEFT JOIN ProductionLine P ON P.Site=T.Site and T.ProLineNo=P.ProLineNo
-    where T.Site in  (Select Site from AccessSite where upper(UserID)=#{user})
+       <where>
+        AND T.Site in  (Select Site from AccessSite where upper(UserID)=#{user})
+            <if test=" site != null and site != ''">
+                and  T.Site like #{site}
+            </if>
+          <if test=" workCenterNo != null and workCenterNo != ''">
+                 and T.workCenterNo like #{workCenterNo}
+            </if>
+        </where>
      </select>
 
     <select id="getWorkCenterResourceData" resultType="com.gaotao.modules.base.entity.WorkCenterResourceData">
@@ -570,4 +578,9 @@ CapacityType,UMID,Active,Remark,CreatedDate,ProLineNo,CanCreateNewRollFlag,NeedS
          </if>
      </where>
     </select>
+
+    <select id="checkConfigurationTemplateID" resultType="com.gaotao.modules.base.entity.PartData">
+        Select  ConfigurationTemplateID
+        from Part  where ConfigurationTemplateID=#{configurationTemplateID} and site=#{site}
+    </select>
 </mapper>

src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

@@ -74,6 +74,12 @@
             </if>
             <if test=" orderNo != null and orderNo != ''">
                 AND 	T.OrderNo like #{orderNo}
+            </if>
+              <if test=" date1 != null ">
+                AND T.OrderDate >= #{date1}
+            </if>
+             <if test=" date2 != null ">
+                AND  #{date2} >= T.OrderDate
             </if>
              <if test=" slittedFlag != null and slittedFlag != ''">
                 AND T.SlittedFlag like #{slittedFlag}
@@ -92,6 +98,12 @@
             </if>
             <if test=" orderNo != null and orderNo != ''">
                 AND 	T.OrderNo like #{orderNo}
+            </if>
+               <if test=" date1 != null ">
+                AND T.OrderDate >= #{date1}
+            </if>
+             <if test=" date2 != null ">
+                AND  #{date2} >= T.OrderDate
             </if>
              <if test=" slittedFlag != null and slittedFlag != ''">
                 AND T.SlittedFlag like #{slittedFlag}
@@ -111,6 +123,9 @@
             <if test=" orderRef3 != null and orderRef3 != ''">
                 AND OrderRef3 = #{orderRef3}
             </if>
+            <if test=" orderRef2 != null and orderRef2 != ''">
+                AND OrderRef2 = #{orderRef2}
+            </if>
 <!--             <if test=" orderRef1 != null and orderRef1 != ''">-->
 <!--                AND OrderRef1 = #{orderRef1}-->
 <!--            </if>-->