Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/mapper/xml/ProfitWarehousingInfoMapper.xml

@@ -9,6 +9,7 @@
 		a.name AS "name",
 		a.type AS "type.id",
 		type.name AS "type.name",
+		type.code AS "type.code",
 		a.marking AS "marking",
 		a.shelves_id AS "shelves.id",
 		shelves.name AS "shelves.name",

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/service/ProfitWarehousingService.java

@@ -93,6 +93,9 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 		ProfitWarehousingInfo profitWarehousingInfo = profitWarehousingInfoMapper.get(infoId);
 //		String numSeq = CodeUtil.code("WZBM", StaticNumSeq.WZBM);
 		Wzcode wzcode = wzcodeService.findByCode(profitWarehousingInfo.getType().getCode());
+		int intNum = wzcode.getIntNum();
+		intNum = intNum+1;
+		wzcode.setIntNum(intNum);
 		QrCode qrCode = new QrCode();
 		qrCode.setProfitWarehousingInfo(profitWarehousingInfo);
 		qrCode.setComeFlag("1");

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/web/ProfitWarehousingController.java

@@ -287,7 +287,14 @@ public class ProfitWarehousingController extends BaseController {
 			j.setMsg("二维码不存在");
 			return j;
 		}
+		if(Objects.equals(profitWarehousingInfo1.getQrCode().getState(), "0")){
 			profitWarehousingService.cleanQr(profitWarehousingInfoId);//保存
+		}else {
+			j.setSuccess(false);
+			j.setMsg("该物资已入账不能清除二维码");
+			return j;
+		}
+
 		j.setSuccess(true);
 		j.setMsg("清除二维码成功");
 		return j;