返退单添加字段

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单列表查询.sql

@@ -1,6 +1,7 @@
 SELECT
     t1.billno,
     t1.type,
+    t1.typemx,
     t1.billdate,
 	t1.sa_aftersalesmagid,
 	t1.sa_orderid,

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单新增.sql

@@ -1,4 +1,4 @@
 insert into sa_aftersalesmag (siteid, sa_aftersalesmagid,createuserid,createby, createdate, billno,billdate,changeuserid,changeby, changedate,
-                                sys_enterpriseid,sa_orderid,reason,isitemreturn,sa_accountclassid,rebate_userate, status,type)
+                                sys_enterpriseid,sa_orderid,reason,isitemreturn,sa_accountclassid,rebate_userate, status,type,typemx)
 values ($siteid$, $sa_aftersalesmagid$,$userid$,$username$, CURRENT_TIME, $billno$,$billdate$,$userid$, $username$, CURRENT_TIME, $sys_enterpriseid$,$sa_orderid$,$reason$,$isitemreturn$,$sa_accountclassid$,$rebate_userate$,
-        '新建',$type$);
+        '新建',$type$,$typemx$);

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单更新.sql

@@ -8,7 +8,8 @@ SET
     isitemreturn=$isitemreturn$,
     sa_accountclassid=$sa_accountclassid$,
     rebate_userate=$rebate_userate$,
-    billdate = $billdate$
+    billdate = $billdate$,
+    typemx=$typemx$
 WHERE sa_aftersalesmagid = $sa_aftersalesmagid$ and siteid=$siteid$
 
 

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单详情查询.sql

@@ -1,6 +1,7 @@
 SELECT
     t1.billno,
     t1.type,
+    t1.typemx,
     t1.billdate,
 	t1.sa_aftersalesmagid,
 	t1.sa_orderid,

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -51,6 +51,7 @@ public class aftersalesmag extends Controller {
         String tableName = "sa_aftersalesmag";
         Long sa_aftersalesmagid = content.getLong("sa_aftersalesmagid");
         String type = content.getString("type");
+        String typemx = content.getString("typemx");
         Long sa_orderid = content.getLong("sa_orderid");
         if (content.containsKey("sys_enterpriseid")) {
             sys_enterpriseid = content.getLong("sys_enterpriseid");
@@ -83,6 +84,7 @@ public class aftersalesmag extends Controller {
 
             sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
             sqlFactory.addParameter("type", type);
+            sqlFactory.addParameter("typemx", typemx);
             sqlList.add(
                     DataContrlLog.createLog(this, "sa_aftersalesmag", sa_aftersalesmagid, "新增", "返退单新增成功").getSQL());
         } else {

src/custom/restcontroller/webmanage/sale/invoice/invoicebill.java

@@ -136,10 +136,12 @@ public class invoicebill extends Controller {
 				if ("0".equals(RowsStatus.get(0).getString("rb"))) {
 					if (!"".equals(RowsStatus.get(0).getString("status"))) {
 						batchDeleteErr.addErr(sa_invoicebillid, "红票已提交，不可删除");
+						continue;
 					}
 				} else {
 					if ("审核".equals(RowsStatus.get(0).getString("parentstatus"))) {
 						batchDeleteErr.addErr(sa_invoicebillid, "审核状态下不可删除");
+						continue;
 					}
 				}
 			}
@@ -341,7 +343,7 @@ public class invoicebill extends Controller {
 	/**
 	 * 对接开票接口进行发票生成
 	 *
-	 * @throws P2Exception
+	 * @throws
 	 */
 	@API(title = "对接开票接口进行发票生成", apiversion = R.ID20221226151803.v1.class)
 	@CACHEING_CLEAN(apiversions = { R.ID20221223153403.v1.class })
@@ -380,7 +382,7 @@ public class invoicebill extends Controller {
 	/**
 	 * 对接开票接口进行发票生成
 	 *
-	 * @throws P2Exception
+	 * @throws
 	 */
 	@API(title = "对接开票接口进行红发票生成", apiversion = R.ID20221226151903.v1.class)
 	@CACHEING_CLEAN(apiversions = { R.ID20221223153403.v1.class })

src/custom/restcontroller/webmanage/sale/invoice/invoicebillitem.java

@@ -227,10 +227,12 @@ public class invoicebillitem extends Controller {
                 if ("0".equals(RowsStatus.get(0).getString("rb"))) {
                     if (!"".equals(RowsStatus.get(0).getString("status"))) {
                         batchDeleteErr.addErr(sa_invoicebill_itemid, "红票已提交，不可删除");
+                        continue;
                     }
                 } else {
                     if ("审核".equals(RowsStatus.get(0).getString("parentstatus"))) {
                         batchDeleteErr.addErr(sa_invoicebill_itemid, "审核状态下不可删除");
+                        continue;
                     }
                 }
             }

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -22,6 +22,7 @@ SELECT t1.itemid,
        t1.length,
        t1.delivery,
        t1.istool,
+       t1.volume,
        t1.ismodule,
        t1.packageqty,
        t1.iswoodproducts,

src/custom/restcontroller/webmanage/sale/itempriceadjust/Itempriceadjust.java

@@ -104,8 +104,10 @@ public class Itempriceadjust extends Controller {
             Rows rows = dbConnect.runSqlQuery("select status from sa_itempriceadjust where sa_itempriceadjustid = " + sa_itempriceadjustid + " and siteid= '" + siteid + "'");
             if (rows.isEmpty()) {
                 batchDeleteErr.addErr(sa_itempriceadjustid, "该数据不存在，删除失败");
+                continue;
             } else if (rows.get(0).getString("status").equals("审核")) {
                 batchDeleteErr.addErr(sa_itempriceadjustid, "该调整单为审核状态，不可删除");
+                continue;
             }
             String sql = "delete from sa_itempriceadjust_itemprice where siteid = '" + siteid + "' and sa_itempriceadjustid = " + sa_itempriceadjustid;
             sqlList.add(sql);