代码补充

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml

@@ -240,10 +240,13 @@
 		    '/purchase/purchaseInquiryForm/purchaseInquiryFormList',<!--采购询价单-->
 		    '/purchase/purchaseQuotationFrm/purchaseQuotationFormList',<!--采购报价单-->
 		    '/purchase/selectionQuotationForm/selectionQuotationFormList',<!--采购报价选定-->
-		    '/purchase/purchaseOrder/PurchaseOrderFormList'<!--采购订单-->
+		    '/purchase/purchaseOrder/PurchaseOrderFormList',<!--采购订单-->
+		    '/inventiry/purchaseIn/purchaseInList',<!--采购入库-->
+		    '/inventiry/salesOutbound/salesOutboundList',<!--销售出库-->
+		    '/purchase/arrivedGoods/ArriveGoodsList'<!--到货单-->
 			)
 
-		group by p.id
+		group by p.id order by p.create_time
 	</select>
 
 </mapper>

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurQuotationSelectionController.java

@@ -205,6 +205,11 @@ public class PurQuotationSelectionController {
                     if(StringUtils.isEmpty(purOrder.getSupplierName())){
 
                         purOrder.setChangeSourceCode(alertEntry.getBillCode());
+                        purOrder.setSourceCode(alertEntry.getBillCode());
+                        if(StringUtils.isNotBlank(purOrder.getSourceCode2())){
+                            purOrder.setSourceCode2(purOrder.getSourceCode2()+"（已变更）");
+                        }
+
                         purOrder.setPaymentTerms(alertEntry.getPaymentTerm());
                         purOrder.setSupplier(alertEntry.getSelectionSupplier());
                         String supplierName = sysDictService.queryTableDictTextByKey(

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/PurOrderShipMapper.java

@@ -36,4 +36,7 @@ public interface PurOrderShipMapper extends BaseMapper<PurOrderShip> {
 	public int purchaseQuotationFormListNum();
 	public int selectionQuotationFormListNum();
 	public int PurchaseOrderFormListNum();
+	public int purchaseInListNum();
+	public int salesOutboundListNum();
+	public int ArriveGoodsListNum();
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/xml/PurOrderShipMapper.xml

@@ -61,6 +61,7 @@
 		where a.del_flag=0 and a.submit=1
 		  and b.id is null
 	</select>
+
 	<select id="PurchaseOrderFormListNum" resultType="int">
 
 		SELECT count(1) from sale_order a
@@ -73,5 +74,27 @@
 		where a.del_flag=0 and a.submit=1
 		  and b.id is null
 	</select>
+	<select id="purchaseInListNum" resultType="int">
+
+		SELECT count(1) from pur_delivery_note a
+			left join store_purchase_in b on a.bill_code = b.source_code and b.del_flag=0
+		where a.del_flag=0 and a.submit=1 and a.close = 0
+		  and b.id is null
+	</select>
+	<select id="salesOutboundListNum" resultType="int">
+
+		SELECT count(1) from sale_delivery a
+			left join store_sale_out b on a.bill_code = b.source_code and b.del_flag=0
+		where a.del_flag=0 and a.submit=1 and a.close = 0
+		  and b.id is null
+	</select>
+	<select id="ArriveGoodsListNum" resultType="int">
+
+		SELECT count(1)
+		from pur_order a
+				 left join pur_delivery_note b on a.bill_code = b.source_code and b.del_flag=0
+		where a.del_flag=0 and a.submit=1 and a.close = 0
+		  and b.id is null
+	</select>
 
 </mapper>

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurOrderServiceImpl.java

@@ -105,6 +105,25 @@ public class PurOrderServiceImpl extends ServiceImpl<PurOrderMapper, PurOrder> i
 				o.setPermsType("PurchaseOrderFormListNum");
 				o.setComponentName("销售订单>>采购订单(Edit/input purchase order)");
 			}
+
+			if("/inventiry/purchaseIn/purchaseInList".equals(url)){
+				num = purOrderShipMapper.purchaseInListNum();
+				o.setPerms("采购流程");
+				o.setPermsType("purchaseInListNum");
+				o.setComponentName("到货单>>采购入库(Purchase Receiving)");
+			}
+			if("/inventiry/salesOutbound/salesOutboundList".equals(url)){
+				num = purOrderShipMapper.salesOutboundListNum();
+				o.setPerms("销售流程");
+				o.setPermsType("salesOutboundListNum");
+				o.setComponentName("发货通知单>>销售出库(Sales Outbound)");
+			}
+			if("/purchase/arrivedGoods/ArriveGoodsList".equals(url)){
+				num = purOrderShipMapper.ArriveGoodsListNum();
+				o.setPerms("采购流程");
+				o.setPermsType("ArriveGoodsListNum");
+				o.setComponentName("采购订单>>到货单(Arrival List)");
+			}
 			o.setDescription(String.valueOf(num));
 		}
 

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleInterfaceSyncServiceImpl.java

@@ -1342,9 +1342,12 @@ public class SaleInterfaceSyncServiceImpl extends ServiceImpl<SaleInterfaceSyncM
         saleInterfaceSync.setCurrencyCode(PDFTableReader.getLineByTitle(pdfTable, "Currency:", null, null, ignoreList));
         List<PdfCell> rowsByTitle = PDFTableReader.getRowsByTitle(pdfTable, "BUYER CONTACT", "SUPPLIER CONTACT", "DETAILS", ignoreList);
 
-        saleInterfaceSync.setBuyerContactName(rowsByTitle.get(1).getText());
-        saleInterfaceSync.setBuyerTelephone(rowsByTitle.get(3).getText());
-        saleInterfaceSync.setBuyerEmail(rowsByTitle.get(5).getText());
+        if(rowsByTitle.size() != 0){
+            saleInterfaceSync.setBuyerContactName(rowsByTitle.get(1).getText());
+            saleInterfaceSync.setBuyerTelephone(rowsByTitle.get(3).getText());
+            saleInterfaceSync.setBuyerEmail(rowsByTitle.get(5).getText());
+        }
+
         saleInterfaceSync.setInquiryNotes(PDFTableReader.getLineByTitle(pdfTable, "Equipment Section Name:", null, null, ignoreList));
         saleInterfaceSync.setComment(PDFTableReader.getLineByTitle(pdfTable, "BUYER COMMENTS", null, "Terms and conditions:", ignoreList));