Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

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

@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.io.FileUtil;
@@ -166,7 +167,13 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 				}else{
 					profitWarehousingInfo.preUpdate();
 					profitWarehousingInfoMapper.update(profitWarehousingInfo);
-					cleanQr(profitWarehousingInfo.getId());				}
+					if(profitWarehousingInfo.getQrCode()!=null){
+						//已入库的不修改
+						if(!Objects.equals(profitWarehousingInfo.getQrCode().getState(), "3")){
+							cleanQr(profitWarehousingInfo.getId());
+						}
+					}
+				}
 			}else{
 				profitWarehousingInfoMapper.delete(profitWarehousingInfo);
 			}

src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp

@@ -101,9 +101,13 @@
           field: 'qrCode.state',
           title: '  状态  ',
           formatter: function (value,row,index){
-             if(value === '2'){
-               return '已入库'
-             }else{
+             if(value === '1'){
+               return '已入库未入账'
+             }else if(value === '2'){
+               return '已入账未下账'
+             } else if(value === '3'){
+               return '已下账'
+             } else {
                return '未入库'
              }
           }