Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -331,7 +331,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 queryWrapper.eq("a.del_flag",0);
 		 queryWrapper.eq("b.del_flag",0);
 		 queryWrapper.eq("a.is_reference",0);
-		 queryWrapper.groupBy("b.group_id");
+		 queryWrapper.eq("a.status",1);
+		 queryWrapper.groupBy("a.document_No");
 		 queryWrapper.orderByDesc("a.create_time");
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
 		 IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.querySyPreAssembledPackingList(page, queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDeposit.java

@@ -136,7 +136,7 @@ public class SyLetterDeposit {
 	/**分销点*/
 	@Excel(name = "分销点", width = 15)
     @ApiModelProperty(value = "分销点")
-	private java.lang.String theDistribution;
+	private java.lang.String distributionPoint;
 	/**总箱数*/
 	@Excel(name = "总箱数", width = 15)
     @ApiModelProperty(value = "总箱数")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -79,8 +79,8 @@ on a.id = b.sy_pre_assembled_packing_list_id
 
     <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
 select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
-a.client_abbreviation as clientAbbreviation,
-a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
+a.client_abbreviation as clientAbbreviation,a.exchange_earnings_value as exchangeEarningsValue,
+a.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
 sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
 a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
 a.the_documents_state as theDocumentsState from sy_letter_deposit a
@@ -92,7 +92,7 @@ on a.id = b.sy_letter_deposit_id
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
-        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,
+        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,
 total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
 container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
 hod

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -138,7 +139,11 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setStartingBoxNumber(syper.getStartingBoxNumber());
                     itenPojo.setEndCaseNumber(syper.getEndCaseNumber());
                     itenPojo.setColour(syper.getColour());
-                    itenPojo.setPiecesBox(syper.getPiecesBox().toString());
+                    BigDecimal piecesBox = syper.getPiecesBox();
+                    if(oConvertUtils.isEmpty(piecesBox)){
+                        piecesBox = BigDecimal.ZERO;
+                    }
+                    itenPojo.setPiecesBox(piecesBox.toString());
                     itenPojo.setBoxNumber(syper.getBoxNumber());
                     itenPojo.setTotal(syper.getTotal());
                     itenPojo.setNetWeight(syper.getNetWeight());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -155,12 +155,6 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
             for (JSONObject jsonObject:jian) {
                 SyOrderData sy = JSONObject.toJavaObject(jsonObject,SyOrderData.class);
                 String ID = sy.getId();
-//                String cbdefine2 = "";
-//                if(sy.getAccount().equals("902")){
-//                    cbdefine2 = "";
-//                }else {
-//                    cbdefine2 = "oe.cbdefine2";
-//                }
                 String sql = "SELECT " +
                         "s.AutoID AS id," +
                         "s.ID AS syOrderDataId," +
@@ -186,29 +180,13 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cMemo AS remarks ," +
                         "d.cComUnitName as masterMetering," +
                         "c.cInvStd as specificationAndModel," +
-                        "s.cSCloser as bankClosedBy" +
-//                        "p.OMPO_Id as ompoId," +
-//                        "p.cVenCode as supplierCode," +
-//                        "v.cVenAbbName as supplier,"+
-//                        "p.iTaxPrice as iTaxPrice," +
-//                        "p.cbdefine2 as ymoney"+
+                        "s.cSCloser as bankClosedBy," +
+                        "be.cbdefine2 as ymoney"+
                         " FROM" +
                         " SO_SODetails s" +
                         " left join Inventory c on c.cInvCode=s.cInvCode" +
                         " left join ComputationUnit d on d.cComunitCode=c.cComUnitCode"+
-//                        " left join (" +
-//                            " SELECT pm.cPOID as OMPO_Id,cVenCode,pd.iTaxPrice,pd.iorderdid,pe.cbdefine2,pd.cInvCode" +
-//                            " FROM PO_Pomain pm " +
-//                            " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
-//                            " LEFT JOIN  PO_Podetails_extradefine pe on pd.id=pe.id" +
-//                            " where pm.cState = 1" +
-//                            " UNION" +
-//                            " SELECT om.cCode as OMPO_Id,om.cVenCode,od.iTaxPrice,od.isosid as iorderdid,"+cbdefine2+",od.cInvCode" +
-//                            " FROM OM_MOMain om " +
-//                            " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
-//                            " LEFT JOIN  OM_MODetails_extradefine oe on od.MODetailsID=oe.MODetailsID" +
-//                        " ) p " +"on s.isosid  = p.iorderdid and s.cInvCode = p.cInvCode"+
-//                        " left join Vendor v on p.cVenCode=v.cVenCode"+
+                        " left join SO_SODetails_extradefine be on be.iSOsID=s.iSOsID"+
                         " where s.ID = "+ID;
                 List<Map<String, Object>> listSon = new ArrayList<>();
                 if(sy.getAccount().equals("901")){