diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index 39dd78d2c..4c090223e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -132,11 +132,11 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
 
                 // 更新商品图片信息
-                String goodsPics = waybill.getGoodsPics()+","+emisWarehouseInBatch.getPicUrl();
-                EmisWaybill  waybillOld = new EmisWaybill();
-                waybillOld.setId(waybill.getId());
-                waybillOld.setGoodsPics(goodsPics);
-                emisWaybillMapper.updateEmisWaybill(waybillOld);
+//                String goodsPics = waybill.getGoodsPics()+","+emisWarehouseInBatch.getPicUrl();
+//                EmisWaybill  waybillOld = new EmisWaybill();
+//                waybillOld.setId(waybill.getId());
+//                waybillOld.setGoodsPics(goodsPics);
+//                emisWaybillMapper.updateEmisWaybill(waybillOld);
             }
         }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 7f1b67a64..65b8fe3fb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -338,9 +338,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         goodsImgBmk=StringUtils.removeEnd(goodsImgBmk, ",");
         gotImgBmk=StringUtils.removeEnd(gotImgBmk, ",");
 
+        // 返回图片
+        dbEmisWaybill.setGoodsPics(goodsImgBmk);
+
 //        private String billPicSendRmk;
 //        /* 签收底单图片 */
 //        private String billPicDispatchRmk;
+
         dbEmisWaybill.setBillPicGoodsRmk(goodsImgBmk);
         dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
         dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
@@ -2789,6 +2793,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 公共计算部分
         calcWayBillCommonInfo(emisWaybillSave,null,true);
 
+        String  goodsPicsStr=emisWaybillSave.getGoodsPics();
+        if(!StringUtils.isEmpty(goodsPicsStr)) {
+            emisWaybillSave.setGoodsPics("1");
+        }
+
         //补齐数据
         emisWaybillMapper.insertEmisWaybill(emisWaybillSave);
 
@@ -2803,7 +2812,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             bindSalesmen(bindEmpCode,customerCode);
         }
 
-
         // 扣减子单
         emisElectronicSitePagService.realMatchSubBill(emisWaybillSave.getSendSiteCode(),"T7080",emisWaybillSave.getParcelQty());
 
@@ -2827,7 +2835,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         // 保存货物图片
-        if(!StringUtils.isEmpty(emisWaybillSave.getGoodsPics())){
+        if(!StringUtils.isEmpty(goodsPicsStr)){
             // 删除历史图片，重新插入图片
             emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode);
 
@@ -2835,7 +2843,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment();
                 goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode);
                 goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
-                goodsPicAttachment.setFileUrl(emisWaybillSave.getGoodsPics());
+                goodsPicAttachment.setFileUrl(goodsPicsStr);
                 goodsPicAttachment.setWaybillId(emisWaybillSave.getId());
                 goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);