功能优化

topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -124,10 +124,10 @@
             <td class="center" >单位</td>
             <td class="center" >数量</td>
             <td class="center" >单价</td>
-            <td class="center" >运输费用</td>
-            <td class="center" >包装费用</td>
+            <td class="center" >运输<br/>费用</td>
+            <td class="center" >包装<br/>费用</td>
             <td class="center" >总金额</td>
-            <td class="center" >外发工序</td>
+            <td class="center" >外发<br/>工序</td>
             <td class="center" >仓库</td>
         </tr>
         <#list materialList as detail>

topsun-xt/src/main/webapp/template/print/topsun/processOuter2.ftl

@@ -124,10 +124,10 @@
             <td class="center" >单位</td>
             <td class="center" >数量</td>
             <td class="center" >单价</td>
-            <td class="center" >运输费用</td>
-            <td class="center" >包装费用</td>
+            <td class="center" >运输<br/>费用</td>
+            <td class="center" >包装<br/>费用</td>
             <td class="center" >总金额</td>
-            <td class="center" >外发工序</td>
+            <td class="center" >外发<br/>工序</td>
             <td class="center" >仓库</td>
         </tr>
         <#list materialList as detail>

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -55,6 +55,7 @@ import com.huigou.uasp.bpm.engine.repository.RuntimeTaskExtensionRepository;
 import com.huigou.util.*;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
+import org.apache.commons.lang3.StringUtils;
 import org.krysalis.barcode4j.HumanReadablePlacement;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.TaskExecutor;
@@ -764,12 +765,15 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
 
                     detailMap.put("maktx",outsourceOrderItem.getProductName());
                     detailMap.put("msehl",outsourceOrderItem.getMeinsName());
-                    detailMap.put("outProcess01",outsourceOrderItem.getWempf());
+                    detailMap.put("outProcess01",outsourceOrderItem.getTxz01());//改成工序描述
                     //临时工序外发，计算印张数；实际送货数量，LOSS数
                     number = number.add(outsourceOrderItem.getMenge());//成品数量
                     loss = loss.add(outsourceOrderItem.getPrintLoss() != null ? outsourceOrderItem.getPrintLoss() : BigDecimal.ZERO);//印张LOSS数改为LOSS数
                     //查询工序报价
                     ProcessQuotedPriceItemNumber quotedPriceItemNumber = processQuotedPriceItemApplication.findQuotedPriceByProductAndProcess(outsourceOrderItem.getProductCode(), outsourceOrderItem.getWempf(), outsourceOrderItem.getMenge(), outsourceOrderItem.getLifnr());
+                    if (StringUtils.isBlank(quotedPriceItemNumber.getId())){
+                        quotedPriceItemNumber = processQuotedPriceItemApplication.findQuotedPriceByProductAndProcess(outsourceOrderItem.getProductCode().replaceAll("^(0+)", ""), outsourceOrderItem.getWempf(), outsourceOrderItem.getMenge(), outsourceOrderItem.getLifnr());
+                    }
                     BigDecimal freight = quotedPriceItemNumber.getFreight();//运输费
                     BigDecimal packMoney = quotedPriceItemNumber.getPackMoney();//包装费
                     BigDecimal priceAmount = productKey.getKbetr();

topsun/src/main/resources/config/topsun/sap/processOutsource/processOutsource.xml

@@ -69,6 +69,7 @@
             t.PRODUCT_NAME,
             t.PRODUCT_TYPE,
             t.PRODUCT_TYPE_NAME,
+            t.uebtk,
             t.remark from sap_process_outsource_order_item t where 1=1
         </sql-query>
         <condition column="process_outsource_id" name="processOutsourceId" type="java.lang.String" symbol="=" alias="t"/>

topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecordItem.xml

@@ -144,6 +144,8 @@
             t.LTSBZ,
             t.REMARK,
             t.CANCEL_FLAG,
+            t.UNTTO,
+            t.UEBTO,
             t.KNUMH from sap_purchase_info_record_item t where 1=1
         </sql-query>
         <condition column="id" name="ids" symbol="in" alias="t"/>