Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -45,6 +45,7 @@ public class Item extends Controller {
 
         Long itemid = content.getLong("itemid");
         String itemno = content.getString("itemno");
+        String aftersalesitemno = content.getString("aftersalesitemno");
         boolean isauxunit = content.getBooleanValue("isauxunit");
 
         ArrayList<String> sqlList = new ArrayList<>();
@@ -72,6 +73,13 @@ public class Item extends Controller {
                     sqlList.add("update plm_item set wmsuploadflag=1 where itemid="+itemid+" and siteid='"+siteid+"'");
                 }
             }
+            
+            if(content.getBooleanValue("ismodule")){
+                Rows aftersalesitemnorows = dbConnect.runSqlQuery("select aftersalesitemno from plm_item where siteid='"+siteid+"' and aftersalesitemno='"+aftersalesitemno+"'");
+                if(aftersalesitemnorows.isNotEmpty()){
+                    return getErrReturnObject().setErrMsg("该配件的售后品号" + aftersalesitemno + "已存在,请修改").toString();
+                }
+            }
 
 
             sqlFactory = new SQLFactory(this, "货品档案更新");
@@ -118,11 +126,13 @@ public class Item extends Controller {
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter("itemno", itemno);
+        sqlFactory.addParameter("aftersalesitemno", aftersalesitemno);
         sqlFactory.addParameter("unitid", content.getLongValue("unitid"));
         sqlFactory.addParameter("isauxunit", isauxunit);
         sqlFactory.addParameter("unitgroupid", isauxunit ? content.getString("unitgroupid") : "null");
 
         sqlFactory.addParameter("itemname", content.getString("itemname"));
+
         sqlFactory.addParameter("isonsale", 0);
         sqlFactory.addParameter("model", content.getString("model"));
         sqlFactory.addParameter("spec", content.getString("spec"));
@@ -395,6 +405,7 @@ public class Item extends Controller {
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("userid", userid);
         sqlFactory.addParameter("itemno", "复制"+item.getString("itemno"));
+        sqlFactory.addParameter("aftersalesitemno", "复制"+item.getString("aftersalesitemno"));
         sqlFactory.addParameter("unitid", item.getLong("unitid"));
         sqlFactory.addParameter("isauxunit", item.getString("isauxunit"));
         sqlFactory.addParameter("unitgroupid", item.getString("unitgroupid"));
@@ -1716,6 +1727,7 @@ public class Item extends Controller {
                     sqlFactory.addParameter("username", username);
                     sqlFactory.addParameter("userid", userid);
                     sqlFactory.addParameter("itemno", row.getString("itemno"));
+                    sqlFactory.addParameter("aftersalesitemno","");
                     sqlFactory.addParameter("unitid", row.getLong("unitid"));
                     sqlFactory.addParameter("isauxunit", 0);
                     sqlFactory.addParameter("unitgroupid", "null");

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

@@ -1,5 +1,6 @@
 SELECT t1.itemid,
        t1.itemno,
+       t1.aftersalesitemno,
        t1.itemname,
        t1.model,
        t1.spec,

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案新增.sql

@@ -6,7 +6,7 @@ insert into plm_item (siteid, itemid, createby, createdate, changeuserid, change
                       sa_customschemeid, cheek, delistingstatus, financeclasstype, stockno, volume, marketingcategory,
                       pricingmetod,cheekschemeid,colorschemeid,materialschemeid,cost,grossprofit,grossprofitmargin,saleprice,
                       rate,grade,custamount,safeqty,icaddqty,icminqty,iswriteoff,isnegative,ispartorderautocheck,islimitemparts,itemname_print,
-                      applicablegassource,hygienelicensenum,departmentid,executionstandards,itemclsnum,outplace,repairattribute,shapesize,topclassnum)
+                      applicablegassource,hygienelicensenum,departmentid,executionstandards,itemclsnum,outplace,repairattribute,shapesize,topclassnum,aftersalesitemno)
 values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME, $itemno$, $unitid$,
         $isauxunit$, $unitgroupid$, $itemname$, $isonsale$, '新建', $model$, $spec$, $orderminqty$, $orderaddqty$,
         $orderminqty_auxunit$, $orderaddqty_auxunit$, $remarks$, $barcode$, $skucontrol$, $batchcontrol$, $grossweight$,
@@ -15,4 +15,4 @@ values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURR
         $iswoodproducts$, $sa_customschemeid$, $cheek$, $delistingstatus$, $financeclasstype$, $stockno$, $volume$,
         $marketingcategory$, $pricingmetod$,$cheekschemeid$,$colorschemeid$,$materialschemeid$,$cost$,$grossprofit$,$grossprofitmargin$,$saleprice$,
         $rate$,$grade$,$custamount$,$safeqty$,$icaddqty$,$icminqty$,$iswriteoff$,$isnegative$,$ispartorderautocheck$,$islimitemparts$,$itemname_print$,
-        $applicablegassource$,$hygienelicensenum$,$departmentid$,$executionstandards$,$itemclsnum$,$outplace$,$repairattribute$,$shapesize$,$topclassnum$)
+        $applicablegassource$,$hygienelicensenum$,$departmentid$,$executionstandards$,$itemclsnum$,$outplace$,$repairattribute$,$shapesize$,$topclassnum$,$aftersalesitemno$)

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -73,7 +73,8 @@ SET changeuserid=$userid$,
     outplace=$outplace$,
     repairattribute=$repairattribute$,
     shapesize=$shapesize$,
-    topclassnum=$topclassnum$
+    topclassnum=$topclassnum$,
+    aftersalesitemno=$aftersalesitemno$
 WHERE itemid = $itemid$
   and siteid = $siteid$
 

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -82,6 +82,7 @@ public class sendplandetail extends Controller {
                 " group by t2.itemid ");
         Rows invbalrows = dbConnect.runSqlQuery("select itemid,sum(qty) qty from st_invbal t1 group by itemid");
         Rows sendplandetails = dbConnect.runSqlQuery("select t1.sa_sendplandetailid,t1.sa_orderid,t2.itemid,t1.sendqty from sa_sendplandetail t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.sa_sendplanid=" + sa_sendplanid + " and t1.siteid='" + siteid + "'");
+
         RowsMap stockbillrowsMap = stockbillrows.toRowsMap("itemid");
         RowsMap invbalrowsMap = invbalrows.toRowsMap("itemid");
         for (Row row : sendplandetails) {
@@ -118,7 +119,21 @@ public class sendplandetail extends Controller {
         for (Row row : rows1) {
             list.add("update sa_sendplandetail set colorflag=1 where sa_sendplanid=" + sa_sendplanid + " and sa_orderid =" + row.getLong("sa_orderid"));
         }
+
+        Rows sendplandetailsgroupitemid = dbConnect.runSqlQuery("select t2.itemid,count(1) count from sa_sendplandetail t1  inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.sa_sendplanid=" + sa_sendplanid + " and t1.siteid='" + siteid + "' group by t2.itemid HAVING COUNT(1) > 1");
+        RowsMap sendplandetailsrowsMap =sendplandetails.toRowsMap("itemid");
+        for(Row row :sendplandetailsgroupitemid){
+            if(sendplandetailsrowsMap.containsKey(row.getString("itemid"))){
+                for(int a=0; a<sendplandetailsrowsMap.get(row.getString("itemid")).size();a++){
+                    if(a>0){
+                        list.add("update sa_sendplandetail set canuseqty=canuseqty-"+a+" where sa_sendplandetailid="+sendplandetailsrowsMap.get(row.getString("itemid")).get(a).getLong("sa_sendplandetailid"));
+                    }
+                }
+            }
+        }
         dbConnect.runSqlUpdate(list);
+
+
         return getSucReturnObject().toString();
     }