diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java index 93087ba..21749e9 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java @@ -306,6 +306,9 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { private Context generateHtmlContents(DeliveryOrderDO deliveryOrder, List deliveryOrderEntrys, int pageIndex) { CustomerDO customer = customerService.getCustomer(deliveryOrder.getCustomerId()); + if(customer==null){ + throw new ServiceException(001, "客户资料已不存在!"); + } Context context = new Context(); context.setVariable("title", "送货单");//标题 context.setVariable("customerName", customer.getName());//客户名称 @@ -314,7 +317,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { context.setVariable("billno", deliveryOrder.getBillno());//送货单编号 context.setVariable("bizDate", DateUtil.date(deliveryOrder.getDate()).toString("yyMMdd"));//业务日期 context.setVariable("customerNo", customer.getNumber());//客户编号 - context.setVariable("tel", deliveryOrder.getTel());//电话 + context.setVariable("tel", customer.getPhone());//电话 String salesPersonIds = deliveryOrder.getSalesPersonIds(); StringBuffer personText = new StringBuffer(); if(StringUtils.isNotBlank(salesPersonIds)){ @@ -323,14 +326,15 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { List userList = adminUserService.getUserList(Arrays.asList(userIds)); for (AdminUserDO adminUserDO : userList) { if(personText.length()==0){ - personText.append(adminUserDO.getUsername()+" / "+adminUserDO.getMobile()); + personText.append(adminUserDO.getNickname()+" / "+adminUserDO.getMobile()); }else { - personText.append(adminUserDO.getUsername()+" / "+adminUserDO.getMobile()+";"); + personText.append(adminUserDO.getNickname()+" / "+adminUserDO.getMobile()+";"); } } } context.setVariable("personText", personText.toString());//负责人 - context.setVariable("totalQty", deliveryOrder.getTotalQty());//总数量 + //context.setVariable("totalQty", deliveryOrder.getTotalQty());//总数量 + context.setVariable("totalQty", " ");//总数量 context.setVariable("logisticsCode", deliveryOrder.getLogisticsCode());//物流单号 context.setVariable("logisticsCompany", deliveryOrder.getLogisticsCompany());//物流公司 @@ -374,8 +378,8 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { items.put("itemIndex", start+j + ""); items.put("productDesc1", productInfo.getCode()); items.put("productDesc2", productInfo.getName()); - items.put("productDesc3", deliveryOrder.getSaleContractNo()); - items.put("productDesc4", deliveryOrder.getCustomerPurNo()); + items.put("productDesc3", "合约编号:"+deliveryOrder.getSaleContractNo()); + items.put("productDesc4", "客户采购编号:"+deliveryOrder.getCustomerPurNo()); items.put("productDesc5", productInfo.getDetails()); items.put("qty", deliveryOrderEntry.getQty() +" " +deliveryOrderEntry.getUnit()); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 3969672..3dd9b45 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -1817,7 +1817,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { if (!StringUtils.equalsAny(saleOrderDO.getBillStatus(), BillStatusEnum.YPLAN.getValue())) { throw new ServiceException(001, "订单状态未排产,不允许生成送货单!"); } - + CustomerDO customer = customerService.getCustomer(saleOrderDO.getCustomerId()); //单据头 DeliveryOrderSaveReqVO deliveryOrderDO = new DeliveryOrderSaveReqVO(); deliveryOrderDO.setBillno(deliveryOrderService.getNewDeliveryOrderCode()); @@ -1828,7 +1828,9 @@ public class SaleOrderServiceImpl implements SaleOrderService { deliveryOrderDO.setPhone(saleOrderDO.getPhone()); deliveryOrderDO.setContact(saleOrderDO.getContactName()); deliveryOrderDO.setDate(LocalDateTime.now()); - deliveryOrderDO.setTel(saleOrderDO.getBillno()); + if(customer!=null){ + deliveryOrderDO.setTel(customer.getPhone()); + } deliveryOrderDO.setSalesPersonIds(saleOrderDO.getOrderFollowerUser()); deliveryOrderDO.setLogisticsCompany(logisticsCompany); deliveryOrderDO.setLogisticsCode(logisticsCode); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html index 32f5322..21d70d1 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html @@ -268,7 +268,7 @@

- <<<合计:11111 件>>>     + <<<合计:11111 件>>>     总重量:

速运公司:11111     diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js index 4456323..4340659 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js @@ -27,14 +27,14 @@ export default { { "options": { "left": 168, - "top": 9, + "top": 4.5, "height": 27, "width": 259, "title": "生产单", - "right": 427, - "bottom": 35.25, - "vCenter": 297.5, - "hCenter": 21.75, + "right": 426.99109649658205, + "bottom": 35.99553680419922, + "vCenter": 297.49109649658205, + "hCenter": 22.49553680419922, "coordinateSync": false, "widthHeightSync": false, "textAlign": "center", @@ -51,7 +51,7 @@ export default { { "options": { "left": 258, - "top": 54, + "top": 30, "height": 16, "width": 200, "field": "clerk", @@ -65,7 +65,7 @@ export default { "right": 460.9959259033203, "bottom": 69.997971534729, "vCenter": 360.9959259033203, - "hCenter": 61.997971534729004, + "hCenter": 61.997971534729007, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -79,14 +79,14 @@ export default { { "options": { "left": 474, - "top": 54, + "top": 30, "height": 9.75, "width": 124, "title": "批次", - "right": 587.2480087280273, - "bottom": 48.741851806640625, - "vCenter": 527.2480087280273, - "hCenter": 43.866851806640625, + "right": 587.2480087280274, + "bottom": 48.741851806640628, + "vCenter": 527.2480087280274, + "hCenter": 43.866851806640628, "field": "batchno", "coordinateSync": false, "widthHeightSync": false, @@ -103,7 +103,7 @@ export default { { "options": { "left": 13.5, - "top": 54, + "top": 30, "height": 16, "width": 200, "field": "billno", @@ -117,9 +117,9 @@ export default { "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, - "right": 133.49185180664062, + "right": 133.49185180664063, "bottom": 60.24388885498047, - "vCenter": 73.49185180664062, + "vCenter": 73.49185180664063, "hCenter": 52.24388885498047, "fixed": true }, @@ -131,13 +131,13 @@ export default { { "options": { "left": 258, - "top": 76.83333333333333, + "top": 46.83333333333333, "height": 9.75, "width": 200, "title": "产品名称", - "right": 296.99388885498047, + "right": 296.99388885498049, "bottom": 74.99388885498047, - "vCenter": 236.99388885498047, + "vCenter": 236.99388885498048, "hCenter": 70.11888885498047, "field": "productName", "coordinateSync": false, @@ -155,7 +155,7 @@ export default { { "options": { "left": 13.5, - "top": 76.83333333333333, + "top": 46.83333333333333, "height": 16, "width": 200, "field": "productCode", @@ -179,7 +179,7 @@ export default { { "options": { "left": 13.5, - "top": 99, + "top": 63, "height": 16, "width": 200, "field": "customerCode", @@ -203,13 +203,13 @@ export default { { "options": { "left": 258, - "top": 99.66666666666666, + "top": 63.66666666666666, "height": 9.75, "width": 200, "title": "生产日期", - "right": 318.74796295166016, + "right": 318.74796295166018, "bottom": 115.49387741088867, - "vCenter": 258.74796295166016, + "vCenter": 258.74796295166018, "hCenter": 110.61887741088867, "field": "produceDateStr", "coordinateSync": false, @@ -227,7 +227,7 @@ export default { { "options": { "left": 474, - "top": 102, + "top": 66, "height": 9.75, "width": 120, "title": "天数", @@ -251,7 +251,7 @@ export default { { "options": { "left": 258, - "top": 121.5, + "top": 79.5, "height": 9.75, "width": 200, "title": "生产线", @@ -275,7 +275,7 @@ export default { { "options": { "left": 13.5, - "top": 121.5, + "top": 79.5, "height": 16, "width": 200, "field": "saleContractNo", @@ -303,7 +303,7 @@ export default { { "options": { "left": 258, - "top": 145.33333333333331, + "top": 94.33333333333332, "height": 9.75, "width": 200, "title": "验货日期", @@ -327,7 +327,7 @@ export default { { "options": { "left": 13.5, - "top": 145.33333333333331, + "top": 94.33333333333332, "height": 16, "width": 200, "field": "contractDateStr", @@ -339,9 +339,9 @@ export default { "title": "合约日期", "qid": "contractDateStr", "right": 153, - "bottom": 191.49797439575195, + "bottom": 191.49797439575196, "vCenter": 93, - "hCenter": 183.49797439575195, + "hCenter": 183.49797439575196, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -356,7 +356,7 @@ export default { { "options": { "left": 258, - "top": 165, + "top": 109.5, "height": 9.75, "width": 200, "title": "交货方式", @@ -380,7 +380,7 @@ export default { { "options": { "left": 13.5, - "top": 165, + "top": 109.5, "height": 16, "width": 200, "field": "contractQty", @@ -391,10 +391,10 @@ export default { "textContentVerticalAlign": "middle", "title": "合约数量", "qid": "contractQty", - "right": 132.74388885498047, - "bottom": 187.74796295166016, + "right": 132.74388885498048, + "bottom": 187.74796295166017, "vCenter": 72.74388885498047, - "hCenter": 179.74796295166016, + "hCenter": 179.74796295166017, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -408,7 +408,7 @@ export default { { "options": { "left": 474, - "top": 187.5, + "top": 124.5, "height": 9.75, "width": 120, "title": "数量", @@ -432,13 +432,13 @@ export default { { "options": { "left": 258, - "top": 187.5, + "top": 124.5, "height": 9.75, "width": 200, "title": "交货日期", - "right": 478.49796295166016, + "right": 478.49796295166018, "bottom": 208.49390029907227, - "vCenter": 418.49796295166016, + "vCenter": 418.49796295166018, "hCenter": 203.61890029907227, "field": "deliverydateStr", "coordinateSync": false, @@ -456,7 +456,7 @@ export default { { "options": { "left": 13.5, - "top": 187.5, + "top": 124.5, "height": 16, "width": 200, "field": "produceQty", @@ -468,9 +468,9 @@ export default { "title": "生产数量", "qid": "produceQty", "right": 134.25, - "bottom": 205.74185180664062, + "bottom": 205.74185180664063, "vCenter": 74.25, - "hCenter": 197.74185180664062, + "hCenter": 197.74185180664063, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -484,7 +484,7 @@ export default { { "options": { "left": 13.5, - "top": 213.83333333333334, + "top": 140.33333333333335, "height": 16, "width": 200, "field": "deliveryPlace", @@ -495,10 +495,10 @@ export default { "textContentVerticalAlign": "middle", "title": "交货地点", "qid": "deliveryPlace", - "right": 132.74185180664062, - "bottom": 220.74388885498047, - "vCenter": 72.74185180664062, - "hCenter": 212.74388885498047, + "right": 132.74185180664063, + "bottom": 220.74388885498048, + "vCenter": 72.74185180664063, + "hCenter": 212.74388885498048, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -512,7 +512,7 @@ export default { { "options": { "left": 258, - "top": 237, + "top": 156, "height": 16, "width": 200, "field": "reportTimeStr", @@ -540,7 +540,7 @@ export default { { "options": { "left": 13.5, - "top": 237, + "top": 156, "height": 16, "width": 200, "field": "reportDateStr", @@ -551,10 +551,10 @@ export default { "textContentVerticalAlign": "middle", "title": "报告日期", "qid": "reportDateStr", - "right": 137.24185180664062, - "bottom": 277.74796295166016, - "vCenter": 77.24185180664062, - "hCenter": 269.74796295166016, + "right": 137.24185180664063, + "bottom": 277.74796295166018, + "vCenter": 77.24185180664063, + "hCenter": 269.74796295166018, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -568,7 +568,7 @@ export default { { "options": { "left": 15, - "top": 260, + "top": 170, "height": 15, "width": 50, "fontSize": 9, @@ -577,9 +577,9 @@ export default { "textContentVerticalAlign": "middle", "title": "生产详情", "qid": "orderId_10", - "right": 134.24185180664062, + "right": 134.24185180664063, "bottom": 313.0000114440918, - "vCenter": 74.24185180664062, + "vCenter": 74.24185180664063, "hCenter": 305.0000114440918, "coordinateSync": false, "widthHeightSync": false, @@ -595,13 +595,13 @@ export default { { "options": { "left": 61.5, - "top": 259.5, + "top": 169.5, "height": 178.5, "width": 532, "right": 593.4955368041992, - "bottom": 440.98885345458984, + "bottom": 440.98885345458987, "vCenter": 327.4955368041992, - "hCenter": 351.73885345458984, + "hCenter": 351.73885345458987, "field": "details", "coordinateSync": false, "widthHeightSync": false, @@ -615,7 +615,7 @@ export default { { "options": { "left": 15, - "top": 501, + "top": 535.5, "height": 20, "width": 120, "fontSize": 9, @@ -624,9 +624,9 @@ export default { "textContentVerticalAlign": "middle", "title": "生产流程", "qid": "orderId_10", - "right": 134.99185180664062, + "right": 134.99185180664063, "bottom": 542.4979858398438, - "vCenter": 74.99185180664062, + "vCenter": 74.99185180664063, "hCenter": 534.4979858398438, "coordinateSync": false, "widthHeightSync": false, @@ -642,7 +642,7 @@ export default { { "options": { "left": 25, - "top": 520, + "top": 554.5, "height": 20, "width": 120, "fontSize": 7.5, @@ -651,10 +651,10 @@ export default { "textContentVerticalAlign": "middle", "title": "设计部A", "qid": "orderId_10", - "right": 149.24574279785156, - "bottom": 481.74146270751953, + "right": 149.24574279785157, + "bottom": 481.74146270751955, "vCenter": 89.24574279785156, - "hCenter": 473.74146270751953, + "hCenter": 473.74146270751955, "coordinateSync": false, "widthHeightSync": false, "hideTitle": true, @@ -669,13 +669,13 @@ export default { { "options": { "left": 171, - "top": 540, + "top": 571.5, "height": 25, "width": 100, "title": "完成数量", - "right": 473.99800872802734, + "right": 473.99800872802737, "bottom": 591.0000114440918, - "vCenter": 413.99800872802734, + "vCenter": 413.99800872802737, "hCenter": 586.1250114440918, "coordinateSync": false, "widthHeightSync": false, @@ -693,7 +693,7 @@ export default { { "options": { "left": 318, - "top": 540, + "top": 571.5, "height": 25, "width": 100, "title": "锌板用量", @@ -717,7 +717,7 @@ export default { { "options": { "left": 462, - "top": 540, + "top": 571.5, "height": 25, "width": 100, "title": "日期时间", @@ -741,14 +741,14 @@ export default { { "options": { "left": 25, - "top": 540, + "top": 571.5, "height": 25, "width": 100, "title": "生产单编号", - "right": 146.24574279785156, - "bottom": 492.99359130859375, + "right": 146.24574279785157, + "bottom": 492.99359130859377, "vCenter": 86.24574279785156, - "hCenter": 487.99359130859375, + "hCenter": 487.99359130859377, "field": " asdas", "coordinateSync": false, "widthHeightSync": false, @@ -765,7 +765,7 @@ export default { { "options": { "left": 69, - "top": 550.5, + "top": 579, "height": 20, "width": 90, "borderWidth": "0.75", @@ -781,7 +781,7 @@ export default { { "options": { "left": 354, - "top": 553.5, + "top": 582, "height": 20, "width": 90, "borderWidth": "0.75", @@ -797,7 +797,7 @@ export default { { "options": { "left": 498, - "top": 553.5, + "top": 582, "height": 20, "width": 90, "borderWidth": "0.75", @@ -817,7 +817,7 @@ export default { { "options": { "left": 205.5, - "top": 555, + "top": 582, "height": 20, "width": 90, "borderWidth": "0.75", @@ -833,7 +833,7 @@ export default { { "options": { "left": 25, - "top": 558, + "top": 583.5, "height": 20, "width": 120, "fontSize": 7.5, @@ -842,9 +842,9 @@ export default { "textContentVerticalAlign": "middle", "title": "切纸部B", "qid": "orderId_10", - "right": 146.24507904052734, + "right": 146.24507904052735, "bottom": 580.2401466369629, - "vCenter": 86.24507904052734, + "vCenter": 86.24507904052735, "hCenter": 570.2401466369629, "coordinateSync": false, "widthHeightSync": false, @@ -860,7 +860,7 @@ export default { { "options": { "left": 171, - "top": 575, + "top": 600.5, "height": 25, "width": 100, "title": "完成数量", @@ -884,7 +884,7 @@ export default { { "options": { "left": 318, - "top": 576.5, + "top": 602, "height": 25, "width": 100, "title": "纸用量", @@ -908,11 +908,11 @@ export default { { "options": { "left": 25, - "top": 577, + "top": 602.5, "height": 25, "width": 100, "title": "生产单编号", - "right": 149.99388885498047, + "right": 149.99388885498048, "bottom": 625.5000228881836, "vCenter": 89.99388885498047, "hCenter": 620.6250228881836, @@ -932,7 +932,7 @@ export default { { "options": { "left": 462, - "top": 577.5, + "top": 604.5, "height": 25, "width": 100, "title": "日期时间", @@ -957,7 +957,7 @@ export default { { "options": { "left": 69, - "top": 585, + "top": 610.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -973,7 +973,7 @@ export default { { "options": { "left": 205.5, - "top": 586.5, + "top": 612, "height": 20, "width": 90, "borderWidth": "0.75", @@ -993,16 +993,16 @@ export default { { "options": { "left": 354, - "top": 586.5, + "top": 612, "height": 20, "width": 90, "borderWidth": "0.75", "coordinateSync": false, "widthHeightSync": false, "fixed": true, - "right": 447.74507904052734, + "right": 447.74507904052737, "bottom": 550.9901695251465, - "vCenter": 402.74507904052734, + "vCenter": 402.74507904052737, "hCenter": 540.9901695251465 }, "printElementType": { @@ -1013,7 +1013,7 @@ export default { { "options": { "left": 498, - "top": 586.5, + "top": 613.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1033,7 +1033,7 @@ export default { { "options": { "left": 25, - "top": 598.5, + "top": 615, "height": 20, "width": 120, "fontSize": 7.5, @@ -1060,7 +1060,7 @@ export default { { "options": { "left": 318, - "top": 611.5, + "top": 634, "height": 25, "width": 100, "title": "机长", @@ -1084,7 +1084,7 @@ export default { { "options": { "left": 462, - "top": 613, + "top": 634, "height": 25, "width": 100, "title": "日期时间", @@ -1109,7 +1109,7 @@ export default { { "options": { "left": 25, - "top": 614.5, + "top": 634, "height": 25, "width": 100, "title": "生产单编号", @@ -1133,7 +1133,7 @@ export default { { "options": { "left": 171, - "top": 616, + "top": 632.5, "height": 25, "width": 100, "title": "完成数量", @@ -1157,7 +1157,7 @@ export default { { "options": { "left": 69, - "top": 622.5, + "top": 640.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1173,7 +1173,7 @@ export default { { "options": { "left": 354, - "top": 625.5, + "top": 642, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1193,7 +1193,7 @@ export default { { "options": { "left": 498, - "top": 625.5, + "top": 642, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1213,7 +1213,7 @@ export default { { "options": { "left": 205.5, - "top": 627, + "top": 643.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1228,8 +1228,8 @@ export default { }, { "options": { - "left": 25, - "top": 627.75, + "left": 25.5, + "top": 673.5, "height": 20, "width": 120, "fontSize": 7.5, @@ -1256,7 +1256,7 @@ export default { { "options": { "left": 318, - "top": 646.5, + "top": 694.5, "height": 25, "width": 100, "title": "包装员", @@ -1281,11 +1281,11 @@ export default { { "options": { "left": 25, - "top": 646.5, + "top": 694.5, "height": 25, "width": 100, "title": "生产单编号", - "right": 147.74388885498047, + "right": 147.74388885498048, "bottom": 714.7418975830078, "vCenter": 87.74388885498047, "hCenter": 709.8668975830078, @@ -1306,7 +1306,7 @@ export default { { "options": { "left": 171, - "top": 648, + "top": 696, "height": 25, "width": 100, "title": "完成数量", @@ -1331,7 +1331,7 @@ export default { { "options": { "left": 462, - "top": 648, + "top": 696, "height": 25, "width": 100, "title": "日期时间", @@ -1355,7 +1355,7 @@ export default { { "options": { "left": 354, - "top": 657, + "top": 705, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1375,7 +1375,7 @@ export default { { "options": { "left": 498, - "top": 657, + "top": 705, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1395,7 +1395,7 @@ export default { { "options": { "left": 205.5, - "top": 658.5, + "top": 706.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1411,7 +1411,7 @@ export default { { "options": { "left": 69, - "top": 658.5, + "top": 706.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1431,7 +1431,7 @@ export default { { "options": { "left": 25, - "top": 663, + "top": 703.5, "height": 20, "width": 120, "fontSize": 7.5, @@ -1458,7 +1458,7 @@ export default { { "options": { "left": 318, - "top": 681.5, + "top": 722, "height": 25, "width": 100, "title": "包装员", @@ -1483,11 +1483,11 @@ export default { { "options": { "left": 25, - "top": 681.5, + "top": 722, "height": 25, "width": 100, "title": "生产单编号", - "right": 147.74388885498047, + "right": 147.74388885498048, "bottom": 714.7418975830078, "vCenter": 87.74388885498047, "hCenter": 709.8668975830078, @@ -1508,7 +1508,7 @@ export default { { "options": { "left": 462, - "top": 682.5, + "top": 723, "height": 25, "width": 100, "title": "日期时间", @@ -1532,7 +1532,7 @@ export default { { "options": { "left": 171, - "top": 683, + "top": 723.5, "height": 25, "width": 100, "title": "完成数量", @@ -1557,7 +1557,7 @@ export default { { "options": { "left": 354, - "top": 691.5, + "top": 732, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1573,7 +1573,7 @@ export default { { "options": { "left": 498, - "top": 691.5, + "top": 732, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1593,7 +1593,7 @@ export default { { "options": { "left": 205.5, - "top": 693, + "top": 733.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1609,7 +1609,7 @@ export default { { "options": { "left": 69, - "top": 693, + "top": 733.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1629,7 +1629,7 @@ export default { { "options": { "left": 25, - "top": 696.75, + "top": 729.75, "height": 20, "width": 120, "fontSize": 7.5, @@ -1656,7 +1656,7 @@ export default { { "options": { "left": 318, - "top": 716.5, + "top": 748, "height": 25, "width": 100, "title": "包装员", @@ -1681,7 +1681,7 @@ export default { { "options": { "left": 462, - "top": 716.5, + "top": 748, "height": 25, "width": 100, "title": "日期时间", @@ -1706,11 +1706,11 @@ export default { { "options": { "left": 25, - "top": 716.5, + "top": 748, "height": 25, "width": 100, "title": "生产单编号", - "right": 147.74388885498047, + "right": 147.74388885498048, "bottom": 714.7418975830078, "vCenter": 87.74388885498047, "hCenter": 709.8668975830078, @@ -1731,7 +1731,7 @@ export default { { "options": { "left": 171, - "top": 718, + "top": 749.5, "height": 25, "width": 100, "title": "完成数量", @@ -1756,7 +1756,7 @@ export default { { "options": { "left": 354, - "top": 726, + "top": 757.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1776,7 +1776,7 @@ export default { { "options": { "left": 498, - "top": 726, + "top": 757.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1796,7 +1796,7 @@ export default { { "options": { "left": 205.5, - "top": 727.5, + "top": 759, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1812,7 +1812,7 @@ export default { { "options": { "left": 69, - "top": 727.5, + "top": 759, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1832,7 +1832,7 @@ export default { { "options": { "left": 25, - "top": 732, + "top": 757.5, "height": 20, "width": 120, "fontSize": 7.5, @@ -1859,7 +1859,7 @@ export default { { "options": { "left": 318, - "top": 751.5, + "top": 775.5, "height": 25, "width": 100, "title": "包装员", @@ -1883,7 +1883,7 @@ export default { { "options": { "left": 462, - "top": 751.5, + "top": 775.5, "height": 25, "width": 100, "title": "日期时间", @@ -1907,11 +1907,11 @@ export default { { "options": { "left": 25, - "top": 751.5, + "top": 775.5, "height": 25, "width": 100, "title": "生产单编号", - "right": 147.74388885498047, + "right": 147.74388885498048, "bottom": 714.7418975830078, "vCenter": 87.74388885498047, "hCenter": 709.8668975830078, @@ -1931,7 +1931,7 @@ export default { { "options": { "left": 171, - "top": 753, + "top": 777, "height": 25, "width": 100, "title": "完成数量", @@ -1955,7 +1955,7 @@ export default { { "options": { "left": 354, - "top": 760.5, + "top": 784.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1975,7 +1975,7 @@ export default { { "options": { "left": 498, - "top": 760.5, + "top": 784.5, "height": 20, "width": 90, "borderWidth": "0.75", @@ -1995,7 +1995,7 @@ export default { { "options": { "left": 205.5, - "top": 762, + "top": 786, "height": 20, "width": 90, "borderWidth": "0.75", @@ -2011,7 +2011,7 @@ export default { { "options": { "left": 69, - "top": 762, + "top": 786, "height": 20, "width": 90, "borderWidth": "0.75", @@ -2027,7 +2027,7 @@ export default { { "options": { "left": 25, - "top": 780, + "top": 792, "height": 20, "width": 555, "title": "物料情况", @@ -2048,7 +2048,7 @@ export default { { "options": { "left": 61.5, - "top": 792, + "top": 801, "height": 7, "width": 530, "borderWidth": "0.75", @@ -2068,7 +2068,7 @@ export default { { "options": { "left": 243, - "top": 810, + "top": 816, "height": 15, "width": 150, "field": "creater", @@ -2096,7 +2096,7 @@ export default { { "options": { "left": 462, - "top": 810, + "top": 816, "height": 15, "width": 150, "field": "creater", @@ -2124,7 +2124,7 @@ export default { { "options": { "left": 244.5, - "top": 811.5, + "top": 817.5, "height": 9, "width": 122, "borderWidth": "0.75", @@ -2144,7 +2144,7 @@ export default { { "options": { "left": 24, - "top": 811.5, + "top": 817.5, "height": 12, "width": 150, "field": "creater", @@ -2172,7 +2172,7 @@ export default { { "options": { "left": 462, - "top": 811.5, + "top": 817.5, "height": 9, "width": 122, "borderWidth": "0.75", @@ -2192,7 +2192,7 @@ export default { { "options": { "left": 24, - "top": 811.5, + "top": 817.5, "height": 20, "width": 122, "borderWidth": "0.75", @@ -2208,11 +2208,11 @@ export default { { "options": { "left": 15, - "top": 441, + "top": 349.5, "height": 9.75, "width": 39, "title": "备注:", - "right": 136.49553680419922, + "right": 136.49553680419923, "bottom": 444.7500228881836, "vCenter": 76.49553680419922, "hCenter": 439.8750228881836, @@ -2230,7 +2230,7 @@ export default { { "options": { "left": 42, - "top": 441, + "top": 349.5, "height": 61.5, "width": 550.5, "right": 592.4977569580078, @@ -2247,14 +2247,208 @@ export default { "title": "", "type": "longText" } + }, + { + "options": { + "left": 25.5, + "top": 646.5, + "height": 20, + "width": 120, + "fontSize": 7.5, + "fontWeight": "700", + "textContentVerticalAlign": "middle", + "title": "印刷部(过油)C", + "qid": "orderId_10", + "right": 145.49107360839845, + "bottom": 663.4933166503906, + "vCenter": 85.49107360839844, + "hCenter": 653.4933166503906, + "coordinateSync": false, + "widthHeightSync": false, + "hideTitle": true, + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "订单编号", + "type": "text" + } + }, + { + "options": { + "left": 69, + "top": 672, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25.5, + "top": 664.5, + "height": 25, + "width": 100, + "title": "生产单编号", + "right": 170.5000228881836, + "bottom": 654.9955596923828, + "vCenter": 120.5000228881836, + "hCenter": 642.4955596923828, + "field": "gfd", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 205.5, + "top": 670.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 171, + "top": 664.5, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 272.49329376220705, + "bottom": 647.497802734375, + "vCenter": 222.49329376220704, + "hCenter": 634.997802734375, + "field": "gg", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 318, + "top": 663, + "height": 25, + "width": 100, + "title": "机长", + "right": 417.99109649658205, + "bottom": 654.2388763427734, + "vCenter": 367.99109649658205, + "hCenter": 641.7388763427734, + "field": "aaa", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 354, + "top": 672, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "right": 439.4977798461914, + "bottom": 656.7433166503906, + "vCenter": 394.4977798461914, + "hCenter": 646.7433166503906, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 462, + "top": 664.5, + "height": 25, + "width": 100, + "title": "日期时间", + "right": 559.741096496582, + "bottom": 654.9955596923828, + "vCenter": 509.74109649658205, + "hCenter": 642.4955596923828, + "field": "asf", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "asf_3" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 499, + "top": 671.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "right": 609, + "bottom": 574.25, + "vCenter": 564, + "hCenter": 564.25, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } } ], "paperNumberLeft": 565, "paperNumberTop": 204, "paperNumberDisabled": true, "paperNumberContinue": true, - "watermarkOptions": {}, - "panelLayoutOptions": {} + "watermarkOptions": {} } ] }