完善代码

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java

@@ -159,6 +159,9 @@ public class SaleDeliveryController {
                                                      HttpServletRequest req) {
         QueryWrapper<SaleDelivery> queryWrapper = QueryGenerator.initQueryWrapper(saleDelivery, req.getParameterMap());
         queryWrapper.eq("carriage_used","否");
+
+        queryWrapper.eq("submit","1");//销售出库单 提交(submit)1是0否
+        queryWrapper.eq("close","0");//销售出库单 关闭(close)1是0否
         Page<SaleDelivery> page = new Page<SaleDelivery>(pageNo, pageSize);
         IPage<SaleDelivery> pageList = saleDeliveryService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -184,7 +187,9 @@ public class SaleDeliveryController {
                                                      HttpServletRequest req) {
         QueryWrapper<SaleDelivery> queryWrapper = QueryGenerator.initQueryWrapper(saleDelivery, req.getParameterMap());
         queryWrapper.isNull("invoice_code");//发票号（开发票时回写至此字段）
-        queryWrapper.eq("apply_invoice","1");//销售出库单 是否开票申请（1是 0否）
+//        queryWrapper.eq("apply_invoice","1");//销售出库单 是否开票申请（1是 0否）
+        queryWrapper.eq("submit","1");//销售出库单 提交(submit)1是0否
+        queryWrapper.eq("close","0");//销售出库单 关闭(close)1是0否
         Page<SaleDelivery> page = new Page<SaleDelivery>(pageNo, pageSize);
         IPage<SaleDelivery> pageList = saleDeliveryService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -309,6 +314,10 @@ public class SaleDeliveryController {
         SaleDelivery saleDelivery = new SaleDelivery();
         BeanUtils.copyProperties(saleDeliveryPage, saleDelivery);
 
+        String sourceCode = saleDelivery.getSourceCode();
+        if (StringUtils.isBlank(sourceCode)) {
+            return Result.error("请参照销售订单新增数据！");
+        }
         String code = saleDelivery.getBillCode();
         if (StringUtils.isNotBlank(code)) {
 
@@ -346,6 +355,12 @@ public class SaleDeliveryController {
     public Result<String> edit(@RequestBody SaleDeliveryPage saleDeliveryPage) {
         SaleDelivery saleDelivery = new SaleDelivery();
         BeanUtils.copyProperties(saleDeliveryPage, saleDelivery);
+
+        String sourceCode = saleDelivery.getSourceCode();
+        if (StringUtils.isBlank(sourceCode)) {
+            return Result.error("请参照销售订单新增数据！");
+        }
+
         SaleDelivery saleDeliveryEntity = saleDeliveryService.getById(saleDelivery.getId());
         if (saleDeliveryEntity == null) {
             return Result.error("未找到对应数据");
@@ -548,6 +563,7 @@ public class SaleDeliveryController {
             QueryWrapper<SaleInvoice> querySaleInvoice = new QueryWrapper();
             querySaleInvoice.eq("source_code", code);
             querySaleInvoice.eq("del_flag", "0");
+            querySaleInvoice.eq("close", "0");//作废(close)1是0否
 
             List<SaleInvoice> listSaleInvoice = saleInvoiceService.list(querySaleInvoice);
             if (listSaleInvoice.size() > 0) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInvoiceController.java

@@ -764,12 +764,13 @@ public class SaleInvoiceController {
         SaleInvoice saleInvoice = saleInvoiceService.getById(id);
         SaleDelivery saleDelivery = saleDeliveryService.getByBillCode(saleInvoice.getSourceCode());
         SaleOrder saleOrder = saleOrderService.getByBillCode(saleDelivery.getSourceCode());
-        if (saleOrder.getDoubleDiscount() == null) {
+        if (saleOrder == null || saleOrder.getDoubleDiscount() == null) {
+            saleOrder = new SaleOrder();
             templates = templatesN;
         } else {
             templates = templatesZ;
         }
-        List<SaleOrderProduct> orderProductList = saleOrderProductService.selectByMainId(saleOrder.getId());
+//        List<SaleOrderProduct> orderProductList = saleOrderProductService.selectByMainId(saleOrder.getId());
         List<SaleInvoiceProduct> productList = saleInvoiceProductService.selectByMainId(id);
         List<SaleInvoiceShip> invoiceShipList = saleInvoiceShipService.selectByMainId(id);
         String productClass = saleDelivery.getProductionClass();
@@ -940,11 +941,14 @@ public class SaleInvoiceController {
                 saleInvoice.setAgreementTerms(saleOrder.getAgreementTerms());
                 // 制单人信息
 //                SysUser sysUser = sysUserService.getUserByName(saleInvoice.getCreateBy());
-                if(saleOrder !=null){
+                if(saleOrder !=null && StringUtils.isNotBlank(saleOrder.getCreateBy())){
                     SysUser sysUser = sysUserService.getUserByName(saleOrder.getCreateBy());
-                    saleInvoice.setSalesPhone(sysUser.getPhone());
-                    saleInvoice.setSalesEmail(sysUser.getEmail());
-                    saleInvoice.setSalesmanName(sysUser.getRealname());
+                    if(sysUser !=null){
+                        saleInvoice.setSalesPhone(sysUser.getPhone());
+                        saleInvoice.setSalesEmail(sysUser.getEmail());
+                        saleInvoice.setSalesmanName(sysUser.getRealname());
+                    }
+
                 }
 
                 String templateFilePath = uploadpath + templates.getTemplateFile();

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoice.java

@@ -219,7 +219,10 @@ public class SaleInvoice implements Serializable {
     private String paymentTermsText;
     @TableField(exist = false)
     private String productionClass;
-    @TableField(exist = false)
+
+    /**币种(currency)*/
+    @Excel(name = "币种(currency)", width = 15)
+    @ApiModelProperty(value = "币种(currency)")
     private String currency;
     @TableField(exist = false)
     private String dueDateText;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleInvoicePage.java

@@ -176,6 +176,10 @@ public class SaleInvoicePage {
 	@Excel(name = "盖章发票(Stamp invoice)", width = 15)
 	@ApiModelProperty(value = "盖章发票(Stamp invoice)")
     private String stampInvoice;
+	/**币种(currency)*/
+	@Excel(name = "币种(currency)", width = 15)
+	@ApiModelProperty(value = "币种(currency)")
+	private String currency;
 
 	@ExcelCollection(name="销售发票子表 - 船明细")
 	@ApiModelProperty(value = "销售发票子表 - 船明细")