Merge branch 'develop' into develop_green

src/custom/beans/stockbill/bills/BasicBill.java

@@ -12,7 +12,6 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 
 public abstract class BasicBill {
     Controller controller;
@@ -41,19 +40,19 @@ public abstract class BasicBill {
             case "销售出库":
                 return new XSCK(controller, st_stockbillid);
             case "返修出库":
-                return new zc(controller, st_stockbillid);
+                return new ck(controller, st_stockbillid);
             case "生产领料出库":
-                return new zc(controller, st_stockbillid);
+                return new ck(controller, st_stockbillid);
             case "委外领料出库":
-                return new zc(controller, st_stockbillid);
+                return new ck(controller, st_stockbillid);
             case "其他出库":
                 return new QTCK(controller, st_stockbillid);
             case "外购入库":
-                return new zc(controller, st_stockbillid);
+                return new rk(controller, st_stockbillid);
             case "生产入库":
-                return new zc(controller, st_stockbillid);
+                return new rk(controller, st_stockbillid);
             case "委外入库":
-                return new zc(controller, st_stockbillid);
+                return new rk(controller, st_stockbillid);
             case "返修入库":
                 return new FXRK(controller, st_stockbillid);
             case "其他入库":

src/custom/beans/stockbill/bills/zc.java → src/custom/beans/stockbill/bills/ck.java

@@ -8,9 +8,9 @@ import common.data.UpdateSQL;
 
 import java.util.ArrayList;
 
-public class zc extends BasicBill {
+public class ck extends BasicBill {
 
-    public zc(Controller controller, long st_stockbillid) throws YosException {
+    public ck(Controller controller, long st_stockbillid) throws YosException {
         super(controller, st_stockbillid);
     }
 
@@ -24,10 +24,9 @@ public class zc extends BasicBill {
         return super.getCheckSql(ischeck);
     }
 
-
     @Override
     public boolean isInStock(boolean fischeck) {
-        if (fischeck && rb == 1 || !fischeck && rb == 0) {
+        if (fischeck && rb == 0 || !fischeck && rb == 1) {
             return true;
         }
         return false;

src/custom/beans/stockbill/bills/rk.java

@@ -0,0 +1,32 @@
+package beans.stockbill.bills;
+
+import common.Controller;
+import common.YosException;
+
+import java.util.ArrayList;
+
+public class rk extends BasicBill {
+
+    public rk(Controller controller, long st_stockbillid) throws YosException {
+        super(controller, st_stockbillid);
+    }
+
+    @Override
+    public void checkValidate(boolean ischeck) throws YosException {
+        super.checkValidate(ischeck);
+    }
+
+    @Override
+    public ArrayList<String> getCheckSql(boolean ischeck) throws YosException {
+        return super.getCheckSql(ischeck);
+    }
+
+
+    @Override
+    public boolean isInStock(boolean fischeck) {
+        if (fischeck && rb == 1 || !fischeck && rb == 0) {
+            return true;
+        }
+        return false;
+    }
+}

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -1162,7 +1162,7 @@ public class cashbill extends Controller {
                 }
             }
         }else{
-            return getErrReturnObject().setErrMsg("选择审核且已导出的收入凭证的数量不能为0").toString();
+            //return getErrReturnObject().setErrMsg("选择审核且已导出的收入凭证的数量不能为0").toString();
         }
         TxtFactory txtFactory =new TxtFactory("Logisticslabel");
         txtFactory.write(buf.toString());
@@ -1173,15 +1173,21 @@ public class cashbill extends Controller {
         }
 
         HashMap<String, Object> result = new HashMap<>();
+        JSONArray jsonArray =new JSONArray();
         result.put("url", url);
         if(agentList.isEmpty()){
-            result.put("errinfo", "");
+            result.put("errinfo",jsonArray);
         }else{
             StringBuffer fagentnums = new StringBuffer();
             for(String str : agentList){
                 fagentnums.append(str+",");
             }
-            result.put("errinfo", "以下经销商"+fagentnums.toString().substring(0, fagentnums.toString().length()-1)+"凭证未导出，原因：未维护U8科目");
+
+            JSONObject object = new JSONObject();
+            object.put("agents", fagentnums.toString().substring(0, fagentnums.toString().length()-1));
+            object.put("errmsg", "未维护U8科目");
+            jsonArray.add(object);
+            result.put("errinfo", jsonArray);
         }
 
         dbConnect.runSqlUpdate(sqlList);

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

@@ -265,6 +265,11 @@ public class serviceorder extends Controller {
                 where.append("t1.isvoid ='").append(whereObject.getString("isvoid")).append("' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("isinstalled") && !"".equals(whereObject.getString("isinstalled"))) {
+                where.append(" and(");
+                where.append(" case when ifnull(t1.cardno,'')='' then '未安装' else '已安装' end ='").append(whereObject.getString("isinstalled")).append("' ");
+                where.append(")");
+            }
         }
 
         SQLFactory sqlFactory = new SQLFactory(this, "序列号查询");