交货单行号和交货单号保证唯一

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -632,7 +632,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                             number.setOrderItem(deliver.getDocItem());
                             number.setOrderCreationTime(deliver.getCreateDateDoc());
                             number.setBelongTo(deliver.getCustomerCode());
-                            number.setCode(deliver.getDeliverNumber()+deliver.getDeliverItem());
+                            StringBuffer buffer=new StringBuffer();
+                            buffer.append(deliver.getDeliverNumber()).append(deliver.getDeliverItem());
+                            number.setCode(buffer.toString());
                             if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
                                 number.setShipmentNumber(deliver.getDeliverNumber());
                             }else{

suishenbang-system/src/main/resources/mapper/system/DeliverQuantityConfirmMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <sql id="selectDeliverQuantityConfirmVo">
-        select id, create_by, create_time, update_by, update_time, is_delete, order_number, order_item, order_creation_time, belong_to, delivery_number, deliver_item,(delivery_number+deliver_item)as code, shipment_number, ship_to_address, material_code, material_name, size_dim, deliver_qty, deliver_wt, confirm_quantity from deliver_quantity_confirm
+        select id, create_by, create_time, update_by, update_time, is_delete, order_number, order_item, order_creation_time, belong_to, delivery_number, deliver_item,concat(delivery_number,deliver_item)as code, shipment_number, ship_to_address, material_code, material_name, size_dim, deliver_qty, deliver_wt, confirm_quantity from deliver_quantity_confirm
     </sql>
 
     <select id="selectDeliverQuantityConfirmList" parameterType="DeliverQuantityConfirm" resultMap="DeliverQuantityConfirmResult">