新增单据打印备注字段

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -13,6 +13,7 @@ import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
 import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
+import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
 import com.glxp.api.admin.req.basic.FilterStockprintRequest;
@@ -37,6 +38,7 @@ import com.glxp.api.admin.service.business.StockOrderDetailTempService;
 import com.glxp.api.admin.service.business.StockOrderService;
 import com.glxp.api.admin.service.business.StockQRCodeTextService;
 import com.glxp.api.admin.service.info.*;
+import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvStockPrintService;
 import com.glxp.api.admin.service.inventory.StockPrintTempService;
 import com.glxp.api.admin.thread.IoTransInoutService;
@@ -67,6 +69,8 @@ public class StockQRCodeTextController {
     @Resource
     StockOrderService stockOrderService;
     @Resource
+    OrderService orderService;
+    @Resource
     StockOrderDetailService stockOrderDetailService;
     @Resource
     StockQRCodeTextService stockQRCodeTextService;
@@ -375,6 +379,7 @@ public class StockQRCodeTextController {
         systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId());
         systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
+        OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
 
         List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
@@ -403,6 +408,7 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     index++;
                 }
 
@@ -429,6 +435,7 @@ public class StockQRCodeTextController {
                 systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2());
                 systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3());
 
+
                 if (systemPDFTemplateEntity == null) return;
 
                 int index = 1;
@@ -442,6 +449,8 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo());
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java

@@ -177,6 +177,20 @@ public class OrderController {
         return ResultVOUtils.success("删除成功");
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/updateOrder")
+    public BaseResponse updateOrder(@RequestBody OrderEntity orderEntity,
+                                    BindingResult bindingResult) {
+        orderEntity.setUpdateTime(new Date());
+        boolean b = orderService.updateOrder(orderEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/updateUnit")
     public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity,

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java

@@ -53,4 +53,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String udiCode;         //条码
     private String serialNo;        //序列号
     private String nameCode;
+    private String billRemark;
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java

@@ -65,4 +65,6 @@ public class OrderEntity {
     private String billTypeName;
     private String subInvName;
     private String invName;
+
+    private String printRemark;
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -209,6 +209,9 @@ public class OrderServiceImpl implements OrderService {
     public OrderEntity findById(String orderId) {
         OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
         orderFilterRequest.setId(orderId);
+        if (StrUtil.isEmpty(orderId)) {
+            return null;
+        }
         return orderDao.findOne(orderFilterRequest);
     }
 

api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java

@@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils {
         for (AuthPermissionRule v : authPermissionRuleList) {
             AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse();
             BeanUtils.copyProperties(v, authPermissionRuleMergeResponse);
+            authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus()));
             if (pid.equals(v.getPid())) {
                 authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId()));
                 authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse);
@@ -33,5 +34,4 @@ public class PermissionRuleTreeUtils {
     }
 
 
-
 }

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, originFromType,invStorageCode)
+                             fromSubInvCode, createTime, originFromType, invStorageCode, printRemark)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,8 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},
+                #{invStorageCode}, #{printRemark})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -64,7 +65,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode,printRemark)
         values (
         #{id},
         #{action},
@@ -99,7 +100,9 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},
-        #{originFromType},#{invStorageCode}
+        #{originFromType},
+        #{invStorageCode},
+        #{printRemark}
         )
     </insert>
 
@@ -142,6 +145,7 @@
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
             <if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
+            <if test="printRemark != null and printRemark != ''">printRemark=#{printRemark},</if>
 
         </trim>
         WHERE id = #{id}